[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>

diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index dd5fb0f346285237dd87e781bdc90a85111973e4..ac09e0c836ee9ed506a8691d055f4f9664e3f07d 100644 (file)
--- 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 0b35a2dbbf70c1928def37fedbb3afc6a74a12f8..db0017ac29eaf1c91bc4b5e36b006a20c7852ca4 100644 (file)
--- 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);