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

[PATCH] softmac: update deauth handler to quiet warning

Browse Source 
Recently the deauth packet handler was updated to use a deauth packet
struct (identical to the auth packet struct) and this now gives a
warning. This patch updates the code to properly use a deauth struct and
deauth variable.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2006-01-31 19:48:06 +01:00
committed by John W. Linville
parent f484d582d3
commit b10c991fa4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,7 +342,7 @@ ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac,
* This should be registered with ieee80211 as handle_deauth * This should be registered with ieee80211 as handle_deauth
*/ */
int int
ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_auth *auth) ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *deauth)
{ {
struct ieee80211softmac_network *net = NULL; struct ieee80211softmac_network *net = NULL;
@@ -350,16 +350,16 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_auth *auth
function_enter(); function_enter();
if (!auth) { if (!deauth) {
dprintk("deauth without deauth packet. eek!\n"); dprintk("deauth without deauth packet. eek!\n");
return 0; return 0;
} }
net = ieee80211softmac_get_network_by_bssid(mac, auth->header.addr2); net = ieee80211softmac_get_network_by_bssid(mac, deauth->header.addr2);
if (net == NULL) { if (net == NULL) {
printkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n", printkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n",
MAC_ARG(auth->header.addr2)); MAC_ARG(deauth->header.addr2));
return 0; return 0;
} }

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

@@ -147,7 +147,7 @@ int ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac, struct ieee
/* for use by _module.c to assign to the callbacks */ /* for use by _module.c to assign to the callbacks */
int ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth); int ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth);
int ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_auth *auth); int ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *deauth);
/*** prototypes from _assoc.c */ /*** prototypes from _assoc.c */
void ieee80211softmac_assoc_work(void *d); void ieee80211softmac_assoc_work(void *d);