openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2012-02-26 11:24:35 +01:00 committed by John W. Linville
parent 3431683759
commit 005e472b45
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/ieee80211_i.h
View File

@ -1128,12 +1128,6 @@ static inline struct ieee80211_local *hw_to_local(
return container_of(hw, struct ieee80211_local, hw); 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) static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
{ {

6
net/mac80211/main.c
View File

@ -286,11 +286,11 @@ static void ieee80211_tasklet_handler(unsigned long data)
/* Clear skb->pkt_type in order to not confuse kernel /* Clear skb->pkt_type in order to not confuse kernel
* netstack. */ * netstack. */
skb->pkt_type = 0; skb->pkt_type = 0;
ieee80211_rx(local_to_hw(local), skb); ieee80211_rx(&local->hw, skb);
break; break;
case IEEE80211_TX_STATUS_MSG: case IEEE80211_TX_STATUS_MSG:
skb->pkt_type = 0; skb->pkt_type = 0;
ieee80211_tx_status(local_to_hw(local), skb); ieee80211_tx_status(&local->hw, skb);
break; break;
case IEEE80211_EOSP_MSG: case IEEE80211_EOSP_MSG:
eosp_data = (void *)skb->cb; 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); ieee80211_hw_roc_setup(local);
return local_to_hw(local); return &local->hw;
} }
EXPORT_SYMBOL(ieee80211_alloc_hw); EXPORT_SYMBOL(ieee80211_alloc_hw);

2
net/mac80211/tx.c
View File

@ -625,7 +625,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
tx->local->hw.wiphy->frag_threshold); tx->local->hw.wiphy->frag_threshold);
/* set up the tx rate control struct we give the RC algo */ /* 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.sband = sband;
txrc.bss_conf = &tx->sdata->vif.bss_conf; txrc.bss_conf = &tx->sdata->vif.bss_conf;
txrc.skb = tx->skb; txrc.skb = tx->skb;

2
net/mac80211/util.c
View File

@ -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) && use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&
!(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE); !(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 */ /* Set defaults according to 802.11-2007 Table 7-37 */
aCWmax = 1023; aCWmax = 1023;
if (use_11b) if (use_11b)