diff options
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 4 | ||||
-rw-r--r-- | net/mac80211/rx.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index e7da1cde3abc..2019b4f0528d 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -1154,8 +1154,8 @@ end_no_lock: | |||
1154 | sta_info_put(sta); | 1154 | sta_info_put(sta); |
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid, | 1157 | static void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid, |
1158 | u16 initiator, u16 reason_code) | 1158 | u16 initiator, u16 reason_code) |
1159 | { | 1159 | { |
1160 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 1160 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
1161 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1161 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 96b0faf40b11..89e1e3070ec1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -295,7 +295,7 @@ ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx) | |||
295 | } | 295 | } |
296 | 296 | ||
297 | 297 | ||
298 | u32 ieee80211_rx_load_stats(struct ieee80211_local *local, | 298 | static u32 ieee80211_rx_load_stats(struct ieee80211_local *local, |
299 | struct sk_buff *skb, | 299 | struct sk_buff *skb, |
300 | struct ieee80211_rx_status *status) | 300 | struct ieee80211_rx_status *status) |
301 | { | 301 | { |
@@ -1664,8 +1664,10 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, | |||
1664 | * This is the actual Rx frames handler. as it blongs to Rx path it must | 1664 | * This is the actual Rx frames handler. as it blongs to Rx path it must |
1665 | * be called with rcu_read_lock protection. | 1665 | * be called with rcu_read_lock protection. |
1666 | */ | 1666 | */ |
1667 | void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, struct sk_buff *skb, | 1667 | static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, |
1668 | struct ieee80211_rx_status *status, u32 load) | 1668 | struct sk_buff *skb, |
1669 | struct ieee80211_rx_status *status, | ||
1670 | u32 load) | ||
1669 | { | 1671 | { |
1670 | struct ieee80211_local *local = hw_to_local(hw); | 1672 | struct ieee80211_local *local = hw_to_local(hw); |
1671 | struct ieee80211_sub_if_data *sdata; | 1673 | struct ieee80211_sub_if_data *sdata; |
@@ -1919,8 +1921,8 @@ u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | |||
1919 | return 1; | 1921 | return 1; |
1920 | } | 1922 | } |
1921 | 1923 | ||
1922 | u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, | 1924 | static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, |
1923 | struct sk_buff *skb) | 1925 | struct sk_buff *skb) |
1924 | { | 1926 | { |
1925 | struct ieee80211_hw *hw = &local->hw; | 1927 | struct ieee80211_hw *hw = &local->hw; |
1926 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 1928 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |