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

Commit 97e93fcd authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

p54: remove get_tx_stats() mac80211 op 



get_tx_stats() will be removed from mac80211.

p54 uses struct ieee80211_tx_queue_stats also internally, so create a new
identical struct p54_tx_queue_stats which the driver can use.

Compile-tested only.

Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Tested-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1296d474

drivers/net/wireless/p54/main.c

+0 −11
Original line number Diff line number Diff line
@@ -358,16 +358,6 @@ static int p54_get_stats(struct ieee80211_hw *dev, 
	return 0;

}



static int p54_get_tx_stats(struct ieee80211_hw *dev,

			    struct ieee80211_tx_queue_stats *stats)

{

	struct p54_common *priv = dev->priv;



	memcpy(stats, &priv->tx_stats[P54_QUEUE_DATA],

	       sizeof(stats[0]) * dev->queues);

	return 0;

}



static void p54_bss_info_changed(struct ieee80211_hw *dev,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *info,
@@ -522,7 +512,6 @@ static const struct ieee80211_ops p54_ops = { 
	.configure_filter	= p54_configure_filter,

	.conf_tx		= p54_conf_tx,

	.get_stats		= p54_get_stats,

	.get_tx_stats		= p54_get_tx_stats

};



struct ieee80211_hw *p54_init_common(size_t priv_data_len)

drivers/net/wireless/p54/p54.h

+7 −1
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ struct p54_led_dev { 


#endif /* CONFIG_P54_LEDS */



struct p54_tx_queue_stats {

	unsigned int len;

	unsigned int limit;

	unsigned int count;

};



struct p54_common {

	struct ieee80211_hw *hw;

	struct ieee80211_vif *vif;
@@ -183,7 +189,7 @@ struct p54_common { 
	/* (e)DCF / QOS state */

	bool use_short_slot;

	spinlock_t tx_stats_lock;

	struct ieee80211_tx_queue_stats tx_stats[8];

	struct p54_tx_queue_stats tx_stats[8];

	struct p54_edcf_queue_param qos_params[8];



	/* Radio data */

drivers/net/wireless/p54/txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int p54_tx_qos_accounting_alloc(struct p54_common *priv, 
				       struct sk_buff *skb,

				       const u16 p54_queue)

{

	struct ieee80211_tx_queue_stats *queue;

	struct p54_tx_queue_stats *queue;

	unsigned long flags;



	if (WARN_ON(p54_queue > P54_QUEUE_NUM))