From c622742e27091399620a25858a0382b79619d347 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 21 Apr 2008 11:47:51 +0300 Subject: [PATCH] --- yaml --- r: 102449 b: refs/heads/master c: 712590de5e5c977ff96efa3a16fcc03b0e976c3c h: refs/heads/master i: 102447: 30ae79d69c9853ccaac75c36e17968fc5524aa1f v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_i.h | 1 - trunk/net/mac80211/mlme.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2eed16508c14..640e10c6b8c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4440e8a47e216adfe32d96a35bef6d13d498b58 +refs/heads/master: 712590de5e5c977ff96efa3a16fcc03b0e976c3c diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h index a05e1db36993..cabdc1439d57 100644 --- a/trunk/net/mac80211/ieee80211_i.h +++ b/trunk/net/mac80211/ieee80211_i.h @@ -940,7 +940,6 @@ void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid, void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *da, u16 tid, u16 initiator, u16 reason); -void sta_rx_agg_session_timer_expired(unsigned long data); void sta_addba_resp_timer_expired(unsigned long data); void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr); u64 ieee80211_sta_get_rates(struct ieee80211_local *local, diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 63b391d01251..e860d0bacea9 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -87,6 +87,7 @@ static int ieee80211_sta_start_scan(struct net_device *dev, u8 *ssid, size_t ssid_len); static int ieee80211_sta_config_auth(struct net_device *dev, struct ieee80211_if_sta *ifsta); +static void sta_rx_agg_session_timer_expired(unsigned long data); void ieee802_11_parse_elems(u8 *start, size_t len, @@ -1608,7 +1609,7 @@ void sta_addba_resp_timer_expired(unsigned long data) * resetting it after each frame that arrives from the originator. * if this timer expires ieee80211_sta_stop_rx_ba_session will be executed. */ -void sta_rx_agg_session_timer_expired(unsigned long data) +static void sta_rx_agg_session_timer_expired(unsigned long data) { /* not an elegant detour, but there is no choice as the timer passes * only one argument, and verious sta_info are needed here, so init