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

[NET] IEEE80211: Fix whitespace errors.

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki
2007-02-09 23:24:46 +09:00
committed by David S. Miller
parent 03d52d7cfc
commit 642656518b
12 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ieee80211/ieee80211_rx.c
View File

@@ -663,7 +663,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
* any security data (IV, ICV, etc) that was left behind */ * any security data (IV, ICV, etc) that was left behind */
if (!can_be_decrypted && (fc & IEEE80211_FCTL_PROTECTED) && if (!can_be_decrypted && (fc & IEEE80211_FCTL_PROTECTED) &&
ieee->host_strip_iv_icv) { ieee->host_strip_iv_icv) {
int trimlen = 0; int trimlen = 0;
/* Top two-bits of byte 3 are the key index */ /* Top two-bits of byte 3 are the key index */
if (skb->len >= hdrlen + 3) if (skb->len >= hdrlen + 3)

6
net/ieee80211/ieee80211_tx.c
View File

@@ -54,7 +54,7 @@ Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs |
| | tion | (BSSID) | | | ence | data | | | | tion | (BSSID) | | | ence | data | |
`--------------------------------------------------| |------' `--------------------------------------------------| |------'
Total: 28 non-data bytes `----.----' Total: 28 non-data bytes `----.----'
| |
.- 'Frame data' expands, if WEP enabled, to <----------' .- 'Frame data' expands, if WEP enabled, to <----------'
| |
V V
@@ -64,8 +64,8 @@ Bytes | 4 | 0-2296 | 4 |
Desc. | IV | Encrypted | ICV | Desc. | IV | Encrypted | ICV |
| | Packet | | | | Packet | |
`-----| |-----' `-----| |-----'
`-----.-----' `-----.-----'
| |
.- 'Encrypted Packet' expands to .- 'Encrypted Packet' expands to
| |
V V

6
net/ieee80211/softmac/ieee80211softmac_auth.c
View File

@@ -182,7 +182,7 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
case WLAN_STATUS_SUCCESS: case WLAN_STATUS_SUCCESS:
/* Update the status to Authenticated */ /* Update the status to Authenticated */
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
net->authenticating = 0; net->authenticating = 0;
net->authenticated = 1; net->authenticated = 1;
spin_unlock_irqrestore(&mac->lock, flags); spin_unlock_irqrestore(&mac->lock, flags);
@@ -262,8 +262,8 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
MAC_ARG(net->bssid), le16_to_cpup(&auth->status)); MAC_ARG(net->bssid), le16_to_cpup(&auth->status));
/* Lock and reset flags */ /* Lock and reset flags */
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
net->authenticating = 0; net->authenticating = 0;
net->authenticated = 0; net->authenticated = 0;
spin_unlock_irqrestore(&mac->lock, flags); spin_unlock_irqrestore(&mac->lock, flags);
/* Count the error? */ /* Count the error? */
break; break;

4
net/ieee80211/softmac/ieee80211softmac_io.c
View File

@@ -445,8 +445,8 @@ ieee80211softmac_send_mgt_frame(struct ieee80211softmac_device *mac,
pkt_size = ieee80211softmac_probe_resp((struct ieee80211_probe_response **)(&pkt), mac, (struct ieee80211softmac_network *)ptrarg); pkt_size = ieee80211softmac_probe_resp((struct ieee80211_probe_response **)(&pkt), mac, (struct ieee80211softmac_network *)ptrarg);
break; break;
default: default:
printkl(KERN_DEBUG PFX "Unsupported Management Frame type: %i\n", type); printkl(KERN_DEBUG PFX "Unsupported Management Frame type: %i\n", type);
return -EINVAL; return -EINVAL;
}; };
if(pkt_size == 0 || pkt == NULL) { if(pkt_size == 0 || pkt == NULL) {

6
net/ieee80211/softmac/ieee80211softmac_module.c
View File

@@ -44,7 +44,7 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv)
softmac->ieee->handle_assoc_response = ieee80211softmac_handle_assoc_response; softmac->ieee->handle_assoc_response = ieee80211softmac_handle_assoc_response;
softmac->ieee->handle_reassoc_request = ieee80211softmac_handle_reassoc_req; softmac->ieee->handle_reassoc_request = ieee80211softmac_handle_reassoc_req;
softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc; softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc;
softmac->ieee->handle_beacon = ieee80211softmac_handle_beacon; softmac->ieee->handle_beacon = ieee80211softmac_handle_beacon;
softmac->scaninfo = NULL; softmac->scaninfo = NULL;
softmac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; softmac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT;
@@ -208,9 +208,9 @@ EXPORT_SYMBOL_GPL(ieee80211softmac_highest_supported_rate);
void ieee80211softmac_process_erp(struct ieee80211softmac_device *mac, void ieee80211softmac_process_erp(struct ieee80211softmac_device *mac,
u8 erp_value) u8 erp_value)
{ {
int use_protection; int use_protection;
int short_preamble; int short_preamble;
u32 changes = 0; u32 changes = 0;
/* Barker preamble mode */ /* Barker preamble mode */
short_preamble = ((erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0 short_preamble = ((erp_value & WLAN_ERP_BARKER_PREAMBLE) == 0

2
net/ieee80211/softmac/ieee80211softmac_priv.h
View File

@@ -156,7 +156,7 @@ int ieee80211softmac_handle_assoc_response(struct net_device * dev,
int ieee80211softmac_handle_disassoc(struct net_device * dev, int ieee80211softmac_handle_disassoc(struct net_device * dev,
struct ieee80211_disassoc * disassoc); struct ieee80211_disassoc * disassoc);
int ieee80211softmac_handle_reassoc_req(struct net_device * dev, int ieee80211softmac_handle_reassoc_req(struct net_device * dev,
struct ieee80211_reassoc_request * reassoc); struct ieee80211_reassoc_request * reassoc);
void ieee80211softmac_assoc_timeout(struct work_struct *work); void ieee80211softmac_assoc_timeout(struct work_struct *work);
void ieee80211softmac_send_disassoc_req(struct ieee80211softmac_device *mac, u16 reason); void ieee80211softmac_send_disassoc_req(struct ieee80211softmac_device *mac, u16 reason);
void ieee80211softmac_disassoc(struct ieee80211softmac_device *mac); void ieee80211softmac_disassoc(struct ieee80211softmac_device *mac);

4
net/ieee80211/softmac/ieee80211softmac_wx.c
View File

@@ -366,7 +366,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev,
} else if (is_zero_ether_addr(data->ap_addr.sa_data)) { } else if (is_zero_ether_addr(data->ap_addr.sa_data)) {
/* the bssid we have is no longer fixed */ /* the bssid we have is no longer fixed */
mac->associnfo.bssfixed = 0; mac->associnfo.bssfixed = 0;
} else { } else {
if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) {
if (mac->associnfo.associating || mac->associnfo.associated) { if (mac->associnfo.associating || mac->associnfo.associated) {
/* bssid unchanged and associated or associating - just return */ /* bssid unchanged and associated or associating - just return */
@@ -380,7 +380,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev,
mac->associnfo.bssfixed = 1; mac->associnfo.bssfixed = 1;
/* queue associate if new bssid or (old one again and not associated) */ /* queue associate if new bssid or (old one again and not associated) */
schedule_delayed_work(&mac->associnfo.work, 0); schedule_delayed_work(&mac->associnfo.work, 0);
} }
out: out:
mutex_unlock(&mac->associnfo.mutex); mutex_unlock(&mac->associnfo.mutex);