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

Commit 005e472b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: remove local_to_hw 



That's a lot longer than open-coding it and
doesn't really add value, so just remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 34316837

net/mac80211/ieee80211_i.h

+0 −6
Original line number Diff line number Diff line
@@ -1128,12 +1128,6 @@ static inline struct ieee80211_local *hw_to_local( 
	return container_of(hw, struct ieee80211_local, hw);

}



static inline struct ieee80211_hw *local_to_hw(

	struct ieee80211_local *local)

{

	return &local->hw;

}





static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)

{

net/mac80211/main.c

+3 −3
Original line number Diff line number Diff line
@@ -286,11 +286,11 @@ static void ieee80211_tasklet_handler(unsigned long data) 
			/* Clear skb->pkt_type in order to not confuse kernel

			 * netstack. */

			skb->pkt_type = 0;

			ieee80211_rx(local_to_hw(local), skb);

			ieee80211_rx(&local->hw, skb);

			break;

		case IEEE80211_TX_STATUS_MSG:

			skb->pkt_type = 0;

			ieee80211_tx_status(local_to_hw(local), skb);

			ieee80211_tx_status(&local->hw, skb);

			break;

		case IEEE80211_EOSP_MSG:

			eosp_data = (void *)skb->cb;
@@ -668,7 +668,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, 


	ieee80211_hw_roc_setup(local);



	return local_to_hw(local);

	return &local->hw;

}

EXPORT_SYMBOL(ieee80211_alloc_hw);

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx) 
			 tx->local->hw.wiphy->frag_threshold);



	/* set up the tx rate control struct we give the RC algo */

	txrc.hw = local_to_hw(tx->local);

	txrc.hw = &tx->local->hw;

	txrc.sband = sband;

	txrc.bss_conf = &tx->sdata->vif.bss_conf;

	txrc.skb = tx->skb;

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata) 
	use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&

		 !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);



	for (queue = 0; queue < local_to_hw(local)->queues; queue++) {

	for (queue = 0; queue < local->hw.queues; queue++) {

		/* Set defaults according to 802.11-2007 Table 7-37 */

		aCWmax = 1023;

		if (use_11b)