summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2006-01-31 19:48:06 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-22 22:17:00 -0500
commitb10c991fa4cf0f1353228e04671aa793b4b3cf1d (patch)
tree9e2a09fbca25358fefddcf5eeb36e90388dd789d /net
parentf484d582d3e66ad78dcce2465c9ec479bacc1075 (diff)
downloadlinux-sh-b10c991fa4cf0f1353228e04671aa793b4b3cf1d.tar.gz
[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 <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_auth.c8
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_priv.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index dd5fb0f34628..ac09e0c836ee 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -342,7 +342,7 @@ ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac,
* 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_device *dev, struct ieee80211_auth *auth
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 0b35a2dbbf70..db0017ac29ea 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -147,7 +147,7 @@ int ieee80211softmac_deauth_req(struct ieee80211softmac_device *mac, struct ieee
/* 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);