diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
commit | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (patch) | |
tree | 711dff90df5ca4e07b5bddf11b2819e5cf2b7a93 /net/mac80211/ieee80211_i.h | |
parent | 278554bd6579206921f5d8a523649a7a57f8850d (diff) | |
parent | 0c348d7c1422d59a86d6fb37b53d75788043e50b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 7ef7798d04cd..1a9e2da37a93 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -998,7 +998,8 @@ int ieee80211_max_network_latency(struct notifier_block *nb, | |||
998 | unsigned long data, void *dummy); | 998 | unsigned long data, void *dummy); |
999 | void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, | 999 | void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, |
1000 | struct ieee80211_channel_sw_ie *sw_elem, | 1000 | struct ieee80211_channel_sw_ie *sw_elem, |
1001 | struct ieee80211_bss *bss); | 1001 | struct ieee80211_bss *bss, |
1002 | u64 timestamp); | ||
1002 | void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata); | 1003 | void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata); |
1003 | void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); | 1004 | void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); |
1004 | 1005 | ||