aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r--net/mac80211/ieee80211.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 506cfa06b184..0e8a70f408e2 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -118,10 +118,6 @@ ieee80211_fill_frame_info(struct ieee80211_local *local,
118 case MODE_IEEE80211G: 118 case MODE_IEEE80211G:
119 fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g); 119 fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g);
120 break; 120 break;
121 case MODE_ATHEROS_TURBO:
122 fi->phytype =
123 htonl(ieee80211_phytype_dsss_dot11_turbo);
124 break;
125 default: 121 default:
126 fi->phytype = htonl(0xAAAAAAAA); 122 fi->phytype = htonl(0xAAAAAAAA);
127 break; 123 break;
@@ -1225,7 +1221,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
1225 local->long_retry_limit = 4; 1221 local->long_retry_limit = 4;
1226 local->hw.conf.radio_enabled = 1; 1222 local->hw.conf.radio_enabled = 1;
1227 1223
1228 local->enabled_modes = (unsigned int) -1; 1224 local->enabled_modes = ~0;
1229 1225
1230 INIT_LIST_HEAD(&local->modes_list); 1226 INIT_LIST_HEAD(&local->modes_list);
1231 1227