diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-04-03 13:50:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-03 13:50:34 -0400 |
commit | 407ad2b7efebe42f8331fd42c4576ed3a6117e29 (patch) | |
tree | 3e2b1bc40015a031c65798b4458ecaeb5430f4fd /net/mac80211/iface.c | |
parent | 3658f3604066d5500ebd73a04084f127dc779441 (diff) | |
parent | 901ceba4e81e9dd6b4a3c4c37ee22000a6c5c65f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 3bfe2612c8c2..58150f877ec3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER); } -static u32 ieee80211_idle_off(struct ieee80211_local *local) +u32 ieee80211_idle_off(struct ieee80211_local *local) { if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) return 0; |