diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-11-04 11:18:19 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 16:13:52 -0500 |
| commit | b92ab5d86dafc2b3733c5fdd5def40c8fe7ea7c9 (patch) | |
| tree | 2676545e9b179102b00e02cc19b9643e8f718871 /include | |
| parent | ee971924543fe82f279d3e97f6f6d02320b381b7 (diff) | |
| download | linux-3.10-b92ab5d86dafc2b3733c5fdd5def40c8fe7ea7c9.tar.gz linux-3.10-b92ab5d86dafc2b3733c5fdd5def40c8fe7ea7c9.tar.bz2 linux-3.10-b92ab5d86dafc2b3733c5fdd5def40c8fe7ea7c9.zip | |
cfg80211: add event for unexpected 4addr frames
The frames are used by AP/STA WDS mode, and hostapd
needs to know when such a frame was received to set
up the VLAN appropriately to allow using it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nl80211.h | 10 | ||||
| -rw-r--r-- | include/net/cfg80211.h | 16 |
2 files changed, 25 insertions, 1 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index c29a284c27e..09474ab7de8 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -517,7 +517,13 @@ * For the event, the %NL80211_ATTR_MAC attribute carries the TA and * other attributes like the interface index are present. * If used as the command it must have an interface index and you can - * only unsubscribe from the event by closing the socket. + * only unsubscribe from the event by closing the socket. Subscription + * is also for %NL80211_CMD_UNEXPECTED_4ADDR_FRAME events. + * + * @NL80211_CMD_UNEXPECTED_4ADDR_FRAME: Sent as an event indicating that the + * associated station identified by %NL80211_ATTR_MAC sent a 4addr frame + * and wasn't already in a 4-addr VLAN. The event will be sent similarly + * to the %NL80211_CMD_UNEXPECTED_FRAME event, to the same listener. * * @NL80211_CMD_PROBE_CLIENT: Probe an associated station on an AP interface * by sending a null data frame to it and reporting when the frame is @@ -667,6 +673,8 @@ enum nl80211_commands { NL80211_CMD_REGISTER_BEACONS, + NL80211_CMD_UNEXPECTED_4ADDR_FRAME, + /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index d01307f54fa..be3535f0895 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -3227,6 +3227,22 @@ bool cfg80211_rx_spurious_frame(struct net_device *dev, const u8 *addr, gfp_t gfp); /** + * cfg80211_rx_unexpected_4addr_frame - inform about unexpected WDS frame + * @dev: The device the frame matched to + * @addr: the transmitter address + * @gfp: context flags + * + * This function is used in AP mode (only!) to inform userspace that + * an associated station sent a 4addr frame but that wasn't expected. + * It is allowed and desirable to send this event only once for each + * station to avoid event flooding. + * Returns %true if the frame was passed to userspace (or this failed + * for a reason other than not having a subscription.) + */ +bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev, + const u8 *addr, gfp_t gfp); + +/** * cfg80211_probe_status - notify userspace about probe status * @dev: the device the probe was sent on * @addr: the address of the peer |