diff options
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_assoc.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index c788377f5648..be61de78dfa4 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
@@ -38,7 +38,7 @@ static void | |||
38 | ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net) | 38 | ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net) |
39 | { | 39 | { |
40 | unsigned long flags; | 40 | unsigned long flags; |
41 | function_enter(); | 41 | |
42 | /* Switch to correct channel for this network */ | 42 | /* Switch to correct channel for this network */ |
43 | mac->set_channel(mac->dev, net->channel); | 43 | mac->set_channel(mac->dev, net->channel); |
44 | 44 | ||
@@ -64,8 +64,6 @@ ieee80211softmac_assoc_timeout(void *d) | |||
64 | struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d; | 64 | struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d; |
65 | unsigned long flags; | 65 | unsigned long flags; |
66 | 66 | ||
67 | function_enter(); | ||
68 | |||
69 | spin_lock_irqsave(&mac->lock, flags); | 67 | spin_lock_irqsave(&mac->lock, flags); |
70 | /* we might race against ieee80211softmac_handle_assoc_response, | 68 | /* we might race against ieee80211softmac_handle_assoc_response, |
71 | * so make sure only one of us does something */ | 69 | * so make sure only one of us does something */ |
@@ -89,7 +87,6 @@ ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason) | |||
89 | { | 87 | { |
90 | unsigned long flags; | 88 | unsigned long flags; |
91 | struct ieee80211softmac_network *found; | 89 | struct ieee80211softmac_network *found; |
92 | function_enter(); | ||
93 | 90 | ||
94 | if (mac->associnfo.bssvalid && mac->associated) { | 91 | if (mac->associnfo.bssvalid && mac->associated) { |
95 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); | 92 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); |
@@ -173,8 +170,6 @@ ieee80211softmac_assoc_work(void *d) | |||
173 | struct ieee80211_network *net = NULL, *best = NULL; | 170 | struct ieee80211_network *net = NULL, *best = NULL; |
174 | unsigned long flags; | 171 | unsigned long flags; |
175 | 172 | ||
176 | function_enter(); | ||
177 | |||
178 | /* meh */ | 173 | /* meh */ |
179 | if (mac->associated) | 174 | if (mac->associated) |
180 | ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); | 175 | ieee80211softmac_disassoc(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); |
@@ -391,8 +386,6 @@ ieee80211softmac_handle_reassoc_req(struct net_device * dev, | |||
391 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); | 386 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); |
392 | struct ieee80211softmac_network *network; | 387 | struct ieee80211softmac_network *network; |
393 | 388 | ||
394 | function_enter(); | ||
395 | |||
396 | network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3); | 389 | network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3); |
397 | if (!network) { | 390 | if (!network) { |
398 | dprintkl(KERN_INFO PFX "reassoc request from unknown network\n"); | 391 | dprintkl(KERN_INFO PFX "reassoc request from unknown network\n"); |