diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-24 14:21:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-24 14:21:00 -0700 |
| commit | cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb (patch) | |
| tree | c2d924b975bdf6fd294546ffb800116c508878e7 /drivers/net/wireless/rtlwifi/wifi.h | |
| parent | 95cb3656c09fcf6577138337216c27744ebc91e2 (diff) | |
| parent | 36099365c7cc64e5184b66b6eb094950a13f540c (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rtlwifi/wifi.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 75dff1e095f..6890e197155 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -937,7 +937,7 @@ struct rtl_mac { int n_channels; int n_bitrates; - bool offchan_deley; + bool offchan_delay; /*filters */ u32 rx_conf; @@ -1982,7 +1982,7 @@ static inline u16 rtl_get_tid(struct sk_buff *skb) static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - u8 *bssid) + const u8 *bssid) { return ieee80211_find_sta(vif, bssid); } |