Skip to content

Commit

Permalink
[PATCH] softmac: update deauth handler to quiet warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Mar 23, 2006
1 parent f484d58 commit b10c991
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions net/ieee80211/softmac/ieee80211softmac_auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,24 +342,24 @@ 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;
struct ieee80211softmac_device *mac = ieee80211_priv(dev);

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;
}

Expand Down
2 changes: 1 addition & 1 deletion net/ieee80211/softmac/ieee80211softmac_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b10c991

Please sign in to comment.