Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b10c991f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

[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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f484d582

net/ieee80211/softmac/ieee80211softmac_auth.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

net/ieee80211/softmac/ieee80211softmac_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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);