From ef036e985dae5e96e0752846f390828bcdb58e53 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Mon, 1 Dec 2008 13:56:55 +0200 Subject: [PATCH] --- yaml --- r: 122495 b: refs/heads/master c: 8e7be8da8ec7cc2828f4434d8d3c2ab4d1d4e7a4 h: refs/heads/master i: 122493: 3aab0f429f5249111a50b1d040d5fbfd8ecd05c6 122491: 24bcfd8728685410951e3a070fb130fccb6bce7b 122487: da2f3b7588d37b06ef3cebff81db6ad580ec3351 122479: f2c98cda693204d5f2125033892aa448f77f96d8 122463: 49600d7c854439377d0ea98be52bcb013613810b 122431: 71329ab85d6c6e2a963422ecf877df3ad6c342a9 122367: b6d9ffbbeb5d838e64e46e4ef3da9073a0dde514 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b33d33783178..d629548306c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a4f4d805db5c930ee4185162dcdc8db9a0379d5 +refs/heads/master: 8e7be8da8ec7cc2828f4434d8d3c2ab4d1d4e7a4 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 0d81b2cfd1a6..d7761e95e4cf 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -1779,8 +1779,7 @@ void ieee80211_tx_pending(unsigned long data) /* functions for drivers to get certain frames */ -static void ieee80211_beacon_add_tim(struct ieee80211_local *local, - struct ieee80211_if_ap *bss, +static void ieee80211_beacon_add_tim(struct ieee80211_if_ap *bss, struct sk_buff *skb, struct beacon_data *beacon) { @@ -1848,7 +1847,6 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, struct ieee80211_local *local = hw_to_local(hw); struct sk_buff *skb = NULL; struct ieee80211_tx_info *info; - struct net_device *bdev; struct ieee80211_sub_if_data *sdata = NULL; struct ieee80211_if_ap *ap = NULL; struct ieee80211_if_sta *ifsta = NULL; @@ -1861,7 +1859,6 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, rcu_read_lock(); sdata = vif_to_sdata(vif); - bdev = sdata->dev; if (sdata->vif.type == NL80211_IFTYPE_AP) { ap = &sdata->u.ap; @@ -1889,12 +1886,12 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, * of the tim bitmap in mac80211 and the driver. */ if (local->tim_in_locked_section) { - ieee80211_beacon_add_tim(local, ap, skb, beacon); + ieee80211_beacon_add_tim(ap, skb, beacon); } else { unsigned long flags; spin_lock_irqsave(&local->sta_lock, flags); - ieee80211_beacon_add_tim(local, ap, skb, beacon); + ieee80211_beacon_add_tim(ap, skb, beacon); spin_unlock_irqrestore(&local->sta_lock, flags); } @@ -2016,14 +2013,12 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct sk_buff *skb = NULL; struct sta_info *sta; struct ieee80211_tx_data tx; - struct net_device *bdev; struct ieee80211_sub_if_data *sdata; struct ieee80211_if_ap *bss = NULL; struct beacon_data *beacon; struct ieee80211_tx_info *info; sdata = vif_to_sdata(vif); - bdev = sdata->dev; bss = &sdata->u.ap; if (!bss)