FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 00:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac80211: remove ieee80211_num_regular_queues

Browse Source 
This inline is useless and actually makes the code _longer_
rather than shorter.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-03-12 23:49:28 +01:00 committed by John W. Linville
parent 14587ce2a8
commit 176be728ee
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/mac80211.h
View File

@ -1017,11 +1017,6 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr)
memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN); memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN);
} }
static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw)
{
return hw->queues;
}
static inline struct ieee80211_rate * static inline struct ieee80211_rate *
ieee80211_get_tx_rate(const struct ieee80211_hw *hw, ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
const struct ieee80211_tx_info *c) const struct ieee80211_tx_info *c)

2
net/mac80211/mlme.c
View File

@ -1834,7 +1834,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
ifmgd->flags |= IEEE80211_STA_CREATE_IBSS | ifmgd->flags |= IEEE80211_STA_CREATE_IBSS |
IEEE80211_STA_AUTO_BSSID_SEL | IEEE80211_STA_AUTO_BSSID_SEL |
IEEE80211_STA_AUTO_CHANNEL_SEL; IEEE80211_STA_AUTO_CHANNEL_SEL;
if (ieee80211_num_regular_queues(&sdata->local->hw) >= 4) if (sdata->local->hw.queues >= 4)
ifmgd->flags |= IEEE80211_STA_WMM_ENABLED; ifmgd->flags |= IEEE80211_STA_WMM_ENABLED;
} }

7
net/mac80211/tx.c
View File

@ -1666,8 +1666,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
} }
/* receiver and we are QoS enabled, use a QoS type frame */ /* receiver and we are QoS enabled, use a QoS type frame */
if (sta_flags & WLAN_STA_WME && if ((sta_flags & WLAN_STA_WME) && local->hw.queues >= 4) {
ieee80211_num_regular_queues(&local->hw) >= 4) {
fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA); fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
hdrlen += 2; hdrlen += 2;
} }
@ -1802,7 +1801,7 @@ void ieee80211_clear_tx_pending(struct ieee80211_local *local)
int i, j; int i, j;
struct ieee80211_tx_stored_packet *store; struct ieee80211_tx_stored_packet *store;
for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) { for (i = 0; i < local->hw.queues; i++) {
if (!test_bit(i, local->queues_pending)) if (!test_bit(i, local->queues_pending))
continue; continue;
store = &local->pending_packet[i]; store = &local->pending_packet[i];
@ -1827,7 +1826,7 @@ void ieee80211_tx_pending(unsigned long data)
int i, ret; int i, ret;
netif_tx_lock_bh(dev); netif_tx_lock_bh(dev);
for (i = 0; i < ieee80211_num_regular_queues(&local->hw); i++) { for (i = 0; i < local->hw.queues; i++) {
/* Check that this queue is ok */ /* Check that this queue is ok */
if (__netif_subqueue_stopped(local->mdev, i) && if (__netif_subqueue_stopped(local->mdev, i) &&
!test_bit(i, local->queues_pending_run)) !test_bit(i, local->queues_pending_run))