adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

mac80211: remove dead code from mlme

Browse source 
The ap_capab and last_probe struct members are unused.

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-07-07 03:45:16 +02:00 committed by John W. Linville
parent 3e5d7649a6
commit a7c1cfc961
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/mac80211/debugfs_netdev.c
View file

@ -100,7 +100,6 @@ IEEE80211_IF_FILE(bssid, u.mgd.bssid, MAC);
IEEE80211_IF_FILE(prev_bssid, u.mgd.prev_bssid, MAC); IEEE80211_IF_FILE(prev_bssid, u.mgd.prev_bssid, MAC);
IEEE80211_IF_FILE(ssid_len, u.mgd.ssid_len, SIZE); IEEE80211_IF_FILE(ssid_len, u.mgd.ssid_len, SIZE);
IEEE80211_IF_FILE(aid, u.mgd.aid, DEC); IEEE80211_IF_FILE(aid, u.mgd.aid, DEC);
IEEE80211_IF_FILE(ap_capab, u.mgd.ap_capab, HEX);
IEEE80211_IF_FILE(capab, u.mgd.capab, HEX); IEEE80211_IF_FILE(capab, u.mgd.capab, HEX);
IEEE80211_IF_FILE(extra_ie_len, u.mgd.extra_ie_len, SIZE); IEEE80211_IF_FILE(extra_ie_len, u.mgd.extra_ie_len, SIZE);
IEEE80211_IF_FILE(auth_tries, u.mgd.auth_tries, DEC); IEEE80211_IF_FILE(auth_tries, u.mgd.auth_tries, DEC);
@ -186,7 +185,6 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
DEBUGFS_ADD(prev_bssid, sta); DEBUGFS_ADD(prev_bssid, sta);
DEBUGFS_ADD(ssid_len, sta); DEBUGFS_ADD(ssid_len, sta);
DEBUGFS_ADD(aid, sta); DEBUGFS_ADD(aid, sta);
DEBUGFS_ADD(ap_capab, sta);
DEBUGFS_ADD(capab, sta); DEBUGFS_ADD(capab, sta);
DEBUGFS_ADD(extra_ie_len, sta); DEBUGFS_ADD(extra_ie_len, sta);
DEBUGFS_ADD(auth_tries, sta); DEBUGFS_ADD(auth_tries, sta);
@ -318,7 +316,6 @@ static void del_sta_files(struct ieee80211_sub_if_data *sdata)
DEBUGFS_DEL(prev_bssid, sta); DEBUGFS_DEL(prev_bssid, sta);
DEBUGFS_DEL(ssid_len, sta); DEBUGFS_DEL(ssid_len, sta);
DEBUGFS_DEL(aid, sta); DEBUGFS_DEL(aid, sta);
DEBUGFS_DEL(ap_capab, sta);
DEBUGFS_DEL(capab, sta); DEBUGFS_DEL(capab, sta);
DEBUGFS_DEL(extra_ie_len, sta); DEBUGFS_DEL(extra_ie_len, sta);
DEBUGFS_DEL(auth_tries, sta); DEBUGFS_DEL(auth_tries, sta);

4
net/mac80211/ieee80211_i.h
View file

@ -268,7 +268,7 @@ struct ieee80211_if_managed {
} state; } state;
u16 aid; u16 aid;
u16 ap_capab, capab; u16 capab;
u8 *extra_ie; /* to be added to the end of AssocReq */ u8 *extra_ie; /* to be added to the end of AssocReq */
size_t extra_ie_len; size_t extra_ie_len;
@ -288,7 +288,6 @@ struct ieee80211_if_managed {
unsigned long request; unsigned long request;
unsigned long last_probe;
unsigned long last_beacon; unsigned long last_beacon;
unsigned int flags; unsigned int flags;
@ -472,7 +471,6 @@ struct ieee80211_sub_if_data {
struct dentry *prev_bssid; struct dentry *prev_bssid;
struct dentry *ssid_len; struct dentry *ssid_len;
struct dentry *aid; struct dentry *aid;
struct dentry *ap_capab;
struct dentry *capab; struct dentry *capab;
struct dentry *extra_ie_len; struct dentry *extra_ie_len;
struct dentry *auth_tries; struct dentry *auth_tries;

2
net/mac80211/mlme.c
View file

@ -879,7 +879,6 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_bss_put(local, bss); ieee80211_rx_bss_put(local, bss);
} }
ifmgd->last_probe = jiffies;
ieee80211_led_assoc(local, 1); ieee80211_led_assoc(local, 1);
sdata->vif.bss_conf.assoc = 1; sdata->vif.bss_conf.assoc = 1;
@ -1488,7 +1487,6 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
printk(KERN_DEBUG "%s: associated\n", sdata->dev->name); printk(KERN_DEBUG "%s: associated\n", sdata->dev->name);
ifmgd->aid = aid; ifmgd->aid = aid;
ifmgd->ap_capab = capab_info;
kfree(ifmgd->assocresp_ies); kfree(ifmgd->assocresp_ies);
ifmgd->assocresp_ies_len = len - (pos - (u8 *) mgmt); ifmgd->assocresp_ies_len = len - (pos - (u8 *) mgmt);