This patch removes unnecessary parameter in ieee80211_beacon_add_tim() and
removes unneeded definition and assignment for bdev (instance of net_device) in
ieee80211_beacon_get() and in ieee80211_get_buffered_bc()
(all in tx.c).
(this patch was prepared in wireless-testing tree).
Signed-off-by: Rami Rosen <[email protected]>
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 0855cac..3f55138 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1783,8 +1783,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)
{
@@ -1852,7 +1851,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;
@@ -1865,7 +1863,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;
@@ -1893,12 +1890,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);
}
@@ -2020,14 +2017,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)
On Mon, 2008-12-01 at 13:56 +0200, Rami Rosen wrote:
> This patch removes unnecessary parameter in ieee80211_beacon_add_tim() and
> removes unneeded definition and assignment for bdev (instance of net_device) in
> ieee80211_beacon_get() and in ieee80211_get_buffered_bc()
> (all in tx.c).
>
> (this patch was prepared in wireless-testing tree).
>
> Signed-off-by: Rami Rosen <[email protected]>
Looks fine to me
Acked-by: Johannes Berg <[email protected]>
>
>
>
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index 0855cac..3f55138 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -1783,8 +1783,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)
> {
> @@ -1852,7 +1851,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;
> @@ -1865,7 +1863,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;
> @@ -1893,12 +1890,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);
> }
>
> @@ -2020,14 +2017,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)
>