diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-21 04:47:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:12 -0400 |
commit | 712590de5e5c977ff96efa3a16fcc03b0e976c3c (patch) | |
tree | fd04dabf7395bc02b847c9bae4054ef9ebbb29da | |
parent | f4440e8a47e216adfe32d96a35bef6d13d498b58 (diff) |
make sta_rx_agg_session_timer_expired() static
sta_rx_agg_session_timer_expired() can now become static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | net/mac80211/ieee80211_i.h | 1 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a05e1db36993..cabdc1439d57 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -940,7 +940,6 @@ void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid, | |||
940 | 940 | ||
941 | void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *da, | 941 | void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *da, |
942 | u16 tid, u16 initiator, u16 reason); | 942 | u16 tid, u16 initiator, u16 reason); |
943 | void sta_rx_agg_session_timer_expired(unsigned long data); | ||
944 | void sta_addba_resp_timer_expired(unsigned long data); | 943 | void sta_addba_resp_timer_expired(unsigned long data); |
945 | void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr); | 944 | void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr); |
946 | u64 ieee80211_sta_get_rates(struct ieee80211_local *local, | 945 | u64 ieee80211_sta_get_rates(struct ieee80211_local *local, |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 63b391d01251..e860d0bacea9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -87,6 +87,7 @@ static int ieee80211_sta_start_scan(struct net_device *dev, | |||
87 | u8 *ssid, size_t ssid_len); | 87 | u8 *ssid, size_t ssid_len); |
88 | static int ieee80211_sta_config_auth(struct net_device *dev, | 88 | static int ieee80211_sta_config_auth(struct net_device *dev, |
89 | struct ieee80211_if_sta *ifsta); | 89 | struct ieee80211_if_sta *ifsta); |
90 | static void sta_rx_agg_session_timer_expired(unsigned long data); | ||
90 | 91 | ||
91 | 92 | ||
92 | void ieee802_11_parse_elems(u8 *start, size_t len, | 93 | void ieee802_11_parse_elems(u8 *start, size_t len, |
@@ -1608,7 +1609,7 @@ timer_expired_exit: | |||
1608 | * resetting it after each frame that arrives from the originator. | 1609 | * resetting it after each frame that arrives from the originator. |
1609 | * if this timer expires ieee80211_sta_stop_rx_ba_session will be executed. | 1610 | * if this timer expires ieee80211_sta_stop_rx_ba_session will be executed. |
1610 | */ | 1611 | */ |
1611 | void sta_rx_agg_session_timer_expired(unsigned long data) | 1612 | static void sta_rx_agg_session_timer_expired(unsigned long data) |
1612 | { | 1613 | { |
1613 | /* not an elegant detour, but there is no choice as the timer passes | 1614 | /* not an elegant detour, but there is no choice as the timer passes |
1614 | * only one argument, and verious sta_info are needed here, so init | 1615 | * only one argument, and verious sta_info are needed here, so init |