Skip to content

L
linux
Commit 988c0f72 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files
Options

mac80211: a few code cleanups 

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1c014420
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 31 deletions
net/mac80211/aes_ccm.c
View file @ 988c0f72
...@@ -134,7 +134,7 @@ int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch, ...@@ -134,7 +134,7 @@ int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
} }
struct crypto_cipher * ieee80211_aes_key_setup_encrypt(const u8 key[]) struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[])
{ {
struct crypto_cipher *tfm; struct crypto_cipher *tfm;
......
net/mac80211/aes_ccm.h
View file @ 988c0f72
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define AES_BLOCK_LEN 16 #define AES_BLOCK_LEN 16
struct crypto_cipher * ieee80211_aes_key_setup_encrypt(const u8 key[]); struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch, void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
u8 *b_0, u8 *aad, u8 *data, size_t data_len, u8 *b_0, u8 *aad, u8 *data, size_t data_len,
u8 *cdata, u8 *mic); u8 *cdata, u8 *mic);
......
net/mac80211/debugfs_netdev.c
View file @ 988c0f72
...@@ -528,7 +528,7 @@ void ieee80211_debugfs_change_if_type(struct ieee80211_sub_if_data *sdata, ...@@ -528,7 +528,7 @@ void ieee80211_debugfs_change_if_type(struct ieee80211_sub_if_data *sdata,
add_files(sdata); add_files(sdata);
} }
static int netdev_notify(struct notifier_block * nb, static int netdev_notify(struct notifier_block *nb,
unsigned long state, unsigned long state,
void *ndev) void *ndev)
{ {
......
net/mac80211/ieee80211_i.h
View file @ 988c0f72
...@@ -919,9 +919,9 @@ ieee80211_rx_result ieee80211_sta_rx_scan( ...@@ -919,9 +919,9 @@ ieee80211_rx_result ieee80211_sta_rx_scan(
void ieee80211_rx_bss_list_init(struct net_device *dev); void ieee80211_rx_bss_list_init(struct net_device *dev);
void ieee80211_rx_bss_list_deinit(struct net_device *dev); void ieee80211_rx_bss_list_deinit(struct net_device *dev);
int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len); int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len);
struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, struct sta_info *ieee80211_ibss_add_sta(struct net_device *dev,
struct sk_buff *skb, u8 *bssid, struct sk_buff *skb, u8 *bssid,
u8 *addr); u8 *addr);
int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason); int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason);
int ieee80211_sta_disassociate(struct net_device *dev, u16 reason); int ieee80211_sta_disassociate(struct net_device *dev, u16 reason);
void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
......
net/mac80211/iface.c
View file @ 988c0f72
...@@ -33,9 +33,8 @@ static void ieee80211_if_sdata_deinit(struct ieee80211_sub_if_data *sdata) ...@@ -33,9 +33,8 @@ 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. */
......
net/mac80211/main.c
View file @ 988c0f72
...@@ -385,8 +385,8 @@ static int ieee80211_open(struct net_device *dev) ...@@ -385,8 +385,8 @@ static int ieee80211_open(struct net_device *dev)
* yet be effective. Trigger execution of ieee80211_sta_work * yet be effective. Trigger execution of ieee80211_sta_work
* to fix this. * to fix this.
*/ */
if(sdata->vif.type == IEEE80211_IF_TYPE_STA || if (sdata->vif.type == IEEE80211_IF_TYPE_STA ||
sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
struct ieee80211_if_sta *ifsta = &sdata->u.sta; struct ieee80211_if_sta *ifsta = &sdata->u.sta;
queue_work(local->hw.workqueue, &ifsta->work); queue_work(local->hw.workqueue, &ifsta->work);
} }
...@@ -1482,7 +1482,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, ...@@ -1482,7 +1482,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
return; return;
} }
rthdr = (struct ieee80211_tx_status_rtap_hdr*) rthdr = (struct ieee80211_tx_status_rtap_hdr *)
skb_push(skb, sizeof(*rthdr)); skb_push(skb, sizeof(*rthdr));
memset(rthdr, 0, sizeof(*rthdr)); memset(rthdr, 0, sizeof(*rthdr));
......
net/mac80211/mlme.c
View file @ 988c0f72
...@@ -306,28 +306,24 @@ static void ieee80211_sta_wmm_params(struct net_device *dev, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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;
...@@ -4220,9 +4217,9 @@ int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len) ...@@ -4220,9 +4217,9 @@ int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
} }
struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, struct sta_info *ieee80211_ibss_add_sta(struct net_device *dev,
struct sk_buff *skb, u8 *bssid, struct sk_buff *skb, u8 *bssid,
u8 *addr) u8 *addr)
{ {
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct sta_info *sta; struct sta_info *sta;
......
net/mac80211/tkip.h
View file @ 988c0f72
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include "key.h" #include "key.h"
u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
u8 iv0, u8 iv1, u8 iv2); u8 iv0, u8 iv1, u8 iv2);
void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta, void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
u16 *phase1key); u16 *phase1key);
void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta, void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
......
net/mac80211/wep.h
View file @ 988c0f72
...@@ -26,7 +26,7 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb, ...@@ -26,7 +26,7 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_key *key); struct ieee80211_key *key);
int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_key *key); struct ieee80211_key *key);
u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); u8 *ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
ieee80211_rx_result ieee80211_rx_result
ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx); ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7