Commit 071d9ac2 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville

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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aa0c8636
...@@ -538,20 +538,12 @@ static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw, ...@@ -538,20 +538,12 @@ static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw,
int index, int index,
struct sk_buff_head *frames) 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 sk_buff *skb = tid_agg_rx->reorder_buf[index];
struct ieee80211_rx_status *status;
if (!skb) if (!skb)
goto no_frame; goto no_frame;
status = IEEE80211_SKB_RXCB(skb); /* release the frame from the reorder ring buffer */
/* release the reordered frames to stack */
sband = hw->wiphy->bands[status->band];
if (!(status->flag & RX_FLAG_HT))
rate = &sband->bitrates[status->rate_idx];
tid_agg_rx->stored_mpdu_num--; tid_agg_rx->stored_mpdu_num--;
tid_agg_rx->reorder_buf[index] = NULL; tid_agg_rx->reorder_buf[index] = NULL;
__skb_queue_tail(frames, skb); __skb_queue_tail(frames, skb);
...@@ -2364,8 +2356,7 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx, ...@@ -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, static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
struct ieee80211_rx_data *rx, struct ieee80211_rx_data *rx,
struct sk_buff *skb, struct sk_buff *skb)
struct ieee80211_rate *rate)
{ {
struct sk_buff_head reorder_release; struct sk_buff_head reorder_release;
ieee80211_rx_result res = RX_DROP_MONITOR; ieee80211_rx_result res = RX_DROP_MONITOR;
...@@ -2489,8 +2480,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, ...@@ -2489,8 +2480,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
* be called with rcu_read_lock protection. * be called with rcu_read_lock protection.
*/ */
static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct sk_buff *skb, struct sk_buff *skb)
struct ieee80211_rate *rate)
{ {
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
...@@ -2598,7 +2588,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -2598,7 +2588,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
prev->name); prev->name);
goto next; goto next;
} }
ieee80211_invoke_rx_handlers(prev, &rx, skb_new, rate); ieee80211_invoke_rx_handlers(prev, &rx, skb_new);
next: next:
prev = sdata; prev = sdata;
} }
...@@ -2614,7 +2604,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -2614,7 +2604,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
} }
} }
if (prev) if (prev)
ieee80211_invoke_rx_handlers(prev, &rx, skb, rate); ieee80211_invoke_rx_handlers(prev, &rx, skb);
else else
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
...@@ -2709,7 +2699,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) ...@@ -2709,7 +2699,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
return; return;
} }
__ieee80211_rx_handle_packet(hw, skb, rate); __ieee80211_rx_handle_packet(hw, skb);
rcu_read_unlock(); rcu_read_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment