Skip to content

Commit

Permalink
nl80211: Generate deauth/disassoc event for locally generated frames
Browse files Browse the repository at this point in the history 
Previously, nl80211 mlme events were generated only for received
deauthentication and disassociation frames. We need to do the same for
locally generated ones in order to let applications know that we
disconnected (e.g., when AP does not reply to a probe). Rename the
nl80211 and cfg80211 functions (s/rx_//) to make it clearer that they
are used for both received and locally generated frames.

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Jouni Malinen authored and John W. Linville committed Apr 22, 2009
1 parent 1778092 commit 53b46b8
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 29 deletions.
16 changes: 8 additions & 8 deletions include/net/cfg80211.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -917,28 +917,28 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len);

/**
* cfg80211_send_rx_deauth - notification of processed deauthentication
* cfg80211_send_deauth - notification of processed deauthentication
* @dev: network device
* @buf: deauthentication frame (header + body)
* @len: length of the frame data
*
* This function is called whenever deauthentication has been processed in
* station mode.
* station mode. This includes both received deauthentication frames and
* locally generated ones.
*/
void cfg80211_send_rx_deauth(struct net_device *dev, const u8 *buf,
size_t len);
void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);

/**
* cfg80211_send_rx_disassoc - notification of processed disassociation
* cfg80211_send_disassoc - notification of processed disassociation
* @dev: network device
* @buf: disassociation response frame (header + body)
* @len: length of the frame data
*
* This function is called whenever disassociation has been processed in
* station mode.
* station mode. This includes both received disassociation frames and locally
* generated ones.
*/
void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf,
size_t len);
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);

/**
* cfg80211_hold_bss - exclude bss from expiration
Expand Down
8 changes: 6 additions & 2 deletions net/mac80211/mlme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
/* u.deauth.reason_code == u.disassoc.reason_code */
mgmt->u.deauth.reason_code = cpu_to_le16(reason);

if (stype == IEEE80211_STYPE_DEAUTH)
cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, skb->len);
else
cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, skb->len);
ieee80211_tx_skb(sdata, skb, ifmgd->flags & IEEE80211_STA_MFP_ENABLED);
}

Expand Down Expand Up @@ -1187,7 +1191,7 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,

ieee80211_set_disassoc(sdata, true, false, 0);
ifmgd->flags &= ~IEEE80211_STA_AUTHENTICATED;
cfg80211_send_rx_deauth(sdata->dev, (u8 *) mgmt, len);
cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, len);
}


Expand Down Expand Up @@ -1218,7 +1222,7 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
}

ieee80211_set_disassoc(sdata, false, false, reason_code);
cfg80211_send_rx_disassoc(sdata->dev, (u8 *) mgmt, len);
cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, len);
}


Expand Down
13 changes: 6 additions & 7 deletions net/wireless/mlme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,18 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len)
}
EXPORT_SYMBOL(cfg80211_send_rx_assoc);

void cfg80211_send_rx_deauth(struct net_device *dev, const u8 *buf, size_t len)
void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len)
{
struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
nl80211_send_rx_deauth(rdev, dev, buf, len);
nl80211_send_deauth(rdev, dev, buf, len);
}
EXPORT_SYMBOL(cfg80211_send_rx_deauth);
EXPORT_SYMBOL(cfg80211_send_deauth);

void cfg80211_send_rx_disassoc(struct net_device *dev, const u8 *buf,
size_t len)
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len)
{
struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
nl80211_send_rx_disassoc(rdev, dev, buf, len);
nl80211_send_disassoc(rdev, dev, buf, len);
}
EXPORT_SYMBOL(cfg80211_send_rx_disassoc);
EXPORT_SYMBOL(cfg80211_send_disassoc);
11 changes: 5 additions & 6 deletions net/wireless/nl80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3415,17 +3415,16 @@ void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
nl80211_send_mlme_event(rdev, netdev, buf, len, NL80211_CMD_ASSOCIATE);
}

void nl80211_send_rx_deauth(struct cfg80211_registered_device *rdev,
struct net_device *netdev, const u8 *buf,
size_t len)
void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
struct net_device *netdev, const u8 *buf, size_t len)
{
nl80211_send_mlme_event(rdev, netdev, buf, len,
NL80211_CMD_DEAUTHENTICATE);
}

void nl80211_send_rx_disassoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev, const u8 *buf,
size_t len)
void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev, const u8 *buf,
size_t len)
{
nl80211_send_mlme_event(rdev, netdev, buf, len,
NL80211_CMD_DISASSOCIATE);
Expand Down
12 changes: 6 additions & 6 deletions net/wireless/nl80211.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ extern void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
extern void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev,
const u8 *buf, size_t len);
extern void nl80211_send_rx_deauth(struct cfg80211_registered_device *rdev,
struct net_device *netdev,
const u8 *buf, size_t len);
extern void nl80211_send_rx_disassoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev,
const u8 *buf, size_t len);
extern void nl80211_send_deauth(struct cfg80211_registered_device *rdev,
struct net_device *netdev,
const u8 *buf, size_t len);
extern void nl80211_send_disassoc(struct cfg80211_registered_device *rdev,
struct net_device *netdev,
const u8 *buf, size_t len);

#endif /* __NET_WIRELESS_NL80211_H */

0 comments on commit 53b46b8

Please sign in to comment.