From: Johannes Berg <[EMAIL PROTECTED]>
Date: Tue Jan 31 19:48:06 2006 +0100
Subject: [PATCH] softmac: update deauth handler to quiet warning
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 <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
net/ieee80211/softmac/ieee80211softmac_auth.c | 8 ++++----
net/ieee80211/softmac/ieee80211softmac_priv.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
ac2c7592fe1268d57e2f881cf55fbfb90cedd654
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c
b/net/ieee80211/softmac/ieee80211softmac_auth.c
index dd5fb0f..ac09e0c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -342,7 +342,7 @@ ieee80211softmac_deauth_req(struct ieee8
* This should be registered with ieee80211 as handle_deauth
*/
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;
@@ -350,16 +350,16 @@ ieee80211softmac_deauth_resp(struct net_
function_enter();
- if (!auth) {
+ if (!deauth) {
dprintk("deauth without deauth packet. eek!\n");
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) {
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;
}
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h
b/net/ieee80211/softmac/ieee80211softmac_priv.h
index 0b35a2d..db0017a 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -147,7 +147,7 @@ int ieee80211softmac_deauth_req(struct i
/* for use by _module.c to assign to the callbacks */
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 */
void ieee80211softmac_assoc_work(void *d);
--
1.2.4
--
John W. Linville
[EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
