mac80211: remove unused rate function parameter
PATCH v2 2/3 mac80211: remove unused rate function parameter
This patch removes a few stale parameters and variables which survived the last, large rx-path reorganization:
"mac80211: correctly place aMPDU RX reorder code"
Signed-off-by Christian Lamparter <[email protected]>
---
WIP -> v2:
- no changes
---
net/mac80211/rx.c +6 -16
@@ -538,20 +538,12 @@ static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw,int index, struct sk_buff_head *frames) { - struct ieee80211_supported_band *sband; -struct ieee80211_rate *rate =NULL ; struct sk_buff *skb = tid_agg_rx->reorder_buf[index]; -struct ieee80211_rx_status *status;if (!skb) goto no_frame; - status =IEEE80211_SKB_RXCB (skb); - -/* release the reordered frames to stack */ - sband = hw->wiphy->bands[status->band]; -if (!(status->flag &RX_FLAG_HT )) - rate = &sband->bitrates[status->rate_idx]; +/* release the frame from the reorder ring buffer */ tid_agg_rx->stored_mpdu_num--; tid_agg_rx->reorder_buf[index] =NULL ;__skb_queue_tail (frames, skb);
@@ -2364,8 +2356,7 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx,static void ieee80211_invoke_rx_handlers (struct ieee80211_sub_if_data *sdata,struct ieee80211_rx_data *rx, -struct sk_buff *skb, -struct ieee80211_rate *rate) +struct sk_buff *skb) {struct sk_buff_head reorder_release;ieee80211_rx_result res =RX_DROP_MONITOR ;
@@ -2489,8 +2480,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,* be called with rcu_read_lock protection. */ static void __ieee80211_rx_handle_packet (struct ieee80211_hw *hw, -struct sk_buff *skb, -struct ieee80211_rate *rate) +struct sk_buff *skb) {struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb);struct ieee80211_local *local =hw_to_local (hw);
@@ -2598,7 +2588,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, prev->name); goto next; } -ieee80211_invoke_rx_handlers (prev, &rx, skb_new, rate); +ieee80211_invoke_rx_handlers (prev, &rx, skb_new); next: prev = sdata; }
@@ -2614,7 +2604,7 @@ next: } }if (prev) -ieee80211_invoke_rx_handlers (prev, &rx, skb, rate); +ieee80211_invoke_rx_handlers (prev, &rx, skb);else dev_kfree_skb (skb); }
@@ -2700,7 +2690,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)return ; } -__ieee80211_rx_handle_packet (hw, skb, rate); +__ieee80211_rx_handle_packet (hw, skb);rcu_read_unlock ();