rev |
line source |
shann@25643
|
1 Since Linux 4.7, the enum ieee80211_band is no longer used
|
shann@25643
|
2
|
shann@25643
|
3 This shall cause no problem's since both enums ieee80211_band
|
shann@25643
|
4 and nl80211_band were added in the same commit:
|
shann@25643
|
5 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
|
shann@25643
|
6
|
shann@25643
|
7 This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
|
shann@25643
|
8
|
shann@25643
|
9 Reference:
|
shann@25643
|
10 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
|
shann@25643
|
11
|
shann@25643
|
12 --- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:57:36.159340297 -0500
|
shann@25643
|
13 +++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:58:18.442323435 -0500
|
shann@25643
|
14 @@ -236,7 +236,7 @@
|
shann@25643
|
15 #endif
|
shann@25643
|
16
|
shann@25643
|
17 #define CHAN2G(_channel, _freq, _flags) { \
|
shann@25643
|
18 - .band = IEEE80211_BAND_2GHZ, \
|
shann@25643
|
19 + .band = NL80211_BAND_2GHZ, \
|
shann@25643
|
20 .center_freq = (_freq), \
|
shann@25643
|
21 .hw_value = (_channel), \
|
shann@25643
|
22 .flags = (_flags), \
|
shann@25643
|
23 @@ -245,7 +245,7 @@
|
shann@25643
|
24 }
|
shann@25643
|
25
|
shann@25643
|
26 #define CHAN5G(_channel, _flags) { \
|
shann@25643
|
27 - .band = IEEE80211_BAND_5GHZ, \
|
shann@25643
|
28 + .band = NL80211_BAND_5GHZ, \
|
shann@25643
|
29 .center_freq = 5000 + (5 * (_channel)), \
|
shann@25643
|
30 .hw_value = (_channel), \
|
shann@25643
|
31 .flags = (_flags), \
|
shann@25643
|
32 @@ -379,7 +379,7 @@
|
shann@25643
|
33 };
|
shann@25643
|
34
|
shann@25643
|
35 static struct ieee80211_supported_band __wl_band_2ghz = {
|
shann@25643
|
36 - .band = IEEE80211_BAND_2GHZ,
|
shann@25643
|
37 + .band = NL80211_BAND_2GHZ,
|
shann@25643
|
38 .channels = __wl_2ghz_channels,
|
shann@25643
|
39 .n_channels = ARRAY_SIZE(__wl_2ghz_channels),
|
shann@25643
|
40 .bitrates = wl_g_rates,
|
shann@25643
|
41 @@ -387,7 +387,7 @@
|
shann@25643
|
42 };
|
shann@25643
|
43
|
shann@25643
|
44 static struct ieee80211_supported_band __wl_band_5ghz_a = {
|
shann@25643
|
45 - .band = IEEE80211_BAND_5GHZ,
|
shann@25643
|
46 + .band = NL80211_BAND_5GHZ,
|
shann@25643
|
47 .channels = __wl_5ghz_a_channels,
|
shann@25643
|
48 .n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
|
shann@25643
|
49 .bitrates = wl_a_rates,
|
shann@25643
|
50 @@ -395,7 +395,7 @@
|
shann@25643
|
51 };
|
shann@25643
|
52
|
shann@25643
|
53 static struct ieee80211_supported_band __wl_band_5ghz_n = {
|
shann@25643
|
54 - .band = IEEE80211_BAND_5GHZ,
|
shann@25643
|
55 + .band = NL80211_BAND_5GHZ,
|
shann@25643
|
56 .channels = __wl_5ghz_n_channels,
|
shann@25643
|
57 .n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
|
shann@25643
|
58 .bitrates = wl_a_rates,
|
shann@25643
|
59 @@ -1876,8 +1876,8 @@
|
shann@25643
|
60 wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
|
shann@25643
|
61 #endif
|
shann@25643
|
62 wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
|
shann@25643
|
63 - wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
|
shann@25643
|
64 - wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a;
|
shann@25643
|
65 + wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
|
shann@25643
|
66 + wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a;
|
shann@25643
|
67 wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
|
shann@25643
|
68 wdev->wiphy->cipher_suites = __wl_cipher_suites;
|
shann@25643
|
69 wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
|
shann@25643
|
70 @@ -2000,7 +2000,7 @@
|
shann@25643
|
71 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
|
shann@25643
|
72 freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
|
shann@25643
|
73 (notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
|
shann@25643
|
74 - IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
|
shann@25643
|
75 + NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
|
shann@25643
|
76 #else
|
shann@25643
|
77 freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
|
shann@25643
|
78 #endif
|
shann@25643
|
79 @@ -2116,7 +2116,7 @@
|
shann@25643
|
80 return err;
|
shann@25643
|
81 }
|
shann@25643
|
82 chan = wf_chspec_ctlchan(chanspec);
|
shann@25643
|
83 - band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
|
shann@25643
|
84 + band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
|
shann@25643
|
85 freq = ieee80211_channel_to_frequency(chan, band);
|
shann@25643
|
86 channel = ieee80211_get_channel(wiphy, freq);
|
shann@25643
|
87 cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
|
shann@25643
|
88 @@ -2250,10 +2250,10 @@
|
shann@25643
|
89 join_params->params.chanspec_list[0] =
|
shann@25643
|
90 ieee80211_frequency_to_channel(chan->center_freq);
|
shann@25643
|
91
|
shann@25643
|
92 - if (chan->band == IEEE80211_BAND_2GHZ) {
|
shann@25643
|
93 + if (chan->band == NL80211_BAND_2GHZ) {
|
shann@25643
|
94 chanspec |= WL_CHANSPEC_BAND_2G;
|
shann@25643
|
95 }
|
shann@25643
|
96 - else if (chan->band == IEEE80211_BAND_5GHZ) {
|
shann@25643
|
97 + else if (chan->band == NL80211_BAND_5GHZ) {
|
shann@25643
|
98 chanspec |= WL_CHANSPEC_BAND_5G;
|
shann@25643
|
99 }
|
shann@25643
|
100 else {
|
shann@25643
|
101 @@ -2885,7 +2885,7 @@
|
shann@25643
|
102
|
shann@25643
|
103 if (phy == 'n' || phy == 'a' || phy == 'v') {
|
shann@25643
|
104 wiphy = wl_to_wiphy(wl);
|
shann@25643
|
105 - wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
|
shann@25643
|
106 + wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
|
shann@25643
|
107 }
|
shann@25643
|
108
|
shann@25643
|
109 return err;
|