lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: a few code cleanups

Browse Source 
This has some code cleanups (some inspired by checkpatch), I got
bored at probably a third of the output though so if somebody
else wants to...

Signed-off-by: Johannes Berg <johannes@sipsolutions.net
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2008-04-17 19:21:22 +02:00
committed by John W. Linville
parent 1c01442058
commit 988c0f723d
9 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/iface.c
View File

@@ -33,10 +33,9 @@ static void ieee80211_if_sdata_deinit(struct ieee80211_sub_if_data *sdata)
{ {
int i; int i;
for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) { for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
__skb_queue_purge(&sdata->fragments[i].skb_list); __skb_queue_purge(&sdata->fragments[i].skb_list);
} }
}
/* Must be called with rtnl lock held. */ /* Must be called with rtnl lock held. */
int ieee80211_if_add(struct net_device *dev, const char *name, int ieee80211_if_add(struct net_device *dev, const char *name,

25
net/mac80211/mlme.c
View File

@@ -306,28 +306,24 @@ static void ieee80211_sta_wmm_params(struct net_device *dev,
switch (aci) { switch (aci) {
case 1: case 1:
queue = IEEE80211_TX_QUEUE_DATA3; queue = IEEE80211_TX_QUEUE_DATA3;
if (acm) { if (acm)
local->wmm_acm |= BIT(0) | BIT(3); local->wmm_acm |= BIT(0) | BIT(3);
}
break; break;
case 2: case 2:
queue = IEEE80211_TX_QUEUE_DATA1; queue = IEEE80211_TX_QUEUE_DATA1;
if (acm) { if (acm)
local->wmm_acm |= BIT(4) | BIT(5); local->wmm_acm |= BIT(4) | BIT(5);
}
break; break;
case 3: case 3:
queue = IEEE80211_TX_QUEUE_DATA0; queue = IEEE80211_TX_QUEUE_DATA0;
if (acm) { if (acm)
local->wmm_acm |= BIT(6) | BIT(7); local->wmm_acm |= BIT(6) | BIT(7);
}
break; break;
case 0: case 0:
default: default:
queue = IEEE80211_TX_QUEUE_DATA2; queue = IEEE80211_TX_QUEUE_DATA2;
if (acm) { if (acm)
local->wmm_acm |= BIT(1) | BIT(2); local->wmm_acm |= BIT(1) | BIT(2);
}
break; break;
} }
@@ -706,9 +702,8 @@ static void ieee80211_send_assoc(struct net_device *dev,
if (bss) { if (bss) {
if (bss->capability & WLAN_CAPABILITY_PRIVACY) if (bss->capability & WLAN_CAPABILITY_PRIVACY)
capab |= WLAN_CAPABILITY_PRIVACY; capab |= WLAN_CAPABILITY_PRIVACY;
if (bss->wmm_ie) { if (bss->wmm_ie)
wmm = 1; wmm = 1;
}
ieee80211_rx_bss_put(dev, bss); ieee80211_rx_bss_put(dev, bss);
} }
@@ -1805,9 +1800,8 @@ static void ieee80211_rx_mgmt_deauth(struct net_device *dev,
" (reason=%d)\n", " (reason=%d)\n",
dev->name, print_mac(mac, mgmt->sa), reason_code); dev->name, print_mac(mac, mgmt->sa), reason_code);
if (ifsta->flags & IEEE80211_STA_AUTHENTICATED) { if (ifsta->flags & IEEE80211_STA_AUTHENTICATED)
printk(KERN_DEBUG "%s: deauthenticated\n", dev->name); printk(KERN_DEBUG "%s: deauthenticated\n", dev->name);
}
if (ifsta->state == IEEE80211_AUTHENTICATE || if (ifsta->state == IEEE80211_AUTHENTICATE ||
ifsta->state == IEEE80211_ASSOCIATE || ifsta->state == IEEE80211_ASSOCIATE ||
@@ -3517,10 +3511,12 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
bss->beacon_int = local->hw.conf.beacon_int; bss->beacon_int = local->hw.conf.beacon_int;
bss->last_update = jiffies; bss->last_update = jiffies;
bss->capability = WLAN_CAPABILITY_IBSS; bss->capability = WLAN_CAPABILITY_IBSS;
if (sdata->default_key) {
if (sdata->default_key)
bss->capability |= WLAN_CAPABILITY_PRIVACY; bss->capability |= WLAN_CAPABILITY_PRIVACY;
} else else
sdata->drop_unencrypted = 0; sdata->drop_unencrypted = 0;
bss->supp_rates_len = sband->n_bitrates; bss->supp_rates_len = sband->n_bitrates;
pos = bss->supp_rates; pos = bss->supp_rates;
for (i = 0; i < sband->n_bitrates; i++) { for (i = 0; i < sband->n_bitrates; i++) {
@@ -4203,6 +4199,7 @@ int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_if_sta *ifsta = &sdata->u.sta; struct ieee80211_if_sta *ifsta = &sdata->u.sta;
kfree(ifsta->extra_ie); kfree(ifsta->extra_ie);
if (len == 0) { if (len == 0) {
ifsta->extra_ie = NULL; ifsta->extra_ie = NULL;