Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3a3c85 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: pass vif param to conf_tx() callback 



tx params should be configured per interface.
add ieee80211_vif param to the conf_tx callback,
and change all the drivers that use this callback.

The following spatch was used:
@rule1@
struct ieee80211_ops ops;
identifier conf_tx_op;
@@
	ops.conf_tx = conf_tx_op;

@rule2@
identifier rule1.conf_tx_op;
identifier hw, queue, params;
@@
	conf_tx_op (
-		struct ieee80211_hw *hw,
+		struct ieee80211_hw *hw, struct ieee80211_vif *vif,
		u16 queue,
		const struct ieee80211_tx_queue_params *params) {...}

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3c607d27

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ ath5k_get_stats(struct ieee80211_hw *hw, 




static int

ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue,

ath5k_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,

	      const struct ieee80211_tx_queue_params *params)

{

	struct ath5k_hw *ah = hw->priv;

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,8 @@ static int ath9k_htc_sta_remove(struct ieee80211_hw *hw, 
	return ret;

}



static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue,

static int ath9k_htc_conf_tx(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif, u16 queue,

			     const struct ieee80211_tx_queue_params *params)

{

	struct ath9k_htc_priv *priv = hw->priv;

drivers/net/wireless/ath/ath9k/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1842,7 +1842,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw, 
	}

}



static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,

static int ath9k_conf_tx(struct ieee80211_hw *hw,

			 struct ieee80211_vif *vif, u16 queue,

			 const struct ieee80211_tx_queue_params *params)

{

	struct ath_softc *sc = hw->priv;

drivers/net/wireless/ath/carl9170/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,8 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw, 
	return 0;

}



static int carl9170_op_conf_tx(struct ieee80211_hw *hw, u16 queue,

static int carl9170_op_conf_tx(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif, u16 queue,

			       const struct ieee80211_tx_queue_params *param)

{

	struct ar9170 *ar = hw->priv;

drivers/net/wireless/b43/main.c

+2 −1
Original line number Diff line number Diff line
@@ -3559,7 +3559,8 @@ static void b43_qos_init(struct b43_wldev *dev) 
	b43dbg(dev->wl, "QoS enabled\n");

}



static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue,

static int b43_op_conf_tx(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif, u16 _queue,

			  const struct ieee80211_tx_queue_params *params)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);