diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/nl80211.h | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 9ab7a0690d93..d530c54a3662 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -4056,6 +4056,7 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr, | |||
| 4056 | * @sig_dbm: signal strength in mBm, or 0 if unknown | 4056 | * @sig_dbm: signal strength in mBm, or 0 if unknown |
| 4057 | * @buf: Management frame (header + body) | 4057 | * @buf: Management frame (header + body) |
| 4058 | * @len: length of the frame data | 4058 | * @len: length of the frame data |
| 4059 | * @flags: flags, as defined in enum nl80211_rxmgmt_flags | ||
| 4059 | * @gfp: context flags | 4060 | * @gfp: context flags |
| 4060 | * | 4061 | * |
| 4061 | * This function is called whenever an Action frame is received for a station | 4062 | * This function is called whenever an Action frame is received for a station |
| @@ -4067,7 +4068,7 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr, | |||
| 4067 | * driver is responsible for rejecting the frame. | 4068 | * driver is responsible for rejecting the frame. |
| 4068 | */ | 4069 | */ |
| 4069 | bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm, | 4070 | bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm, |
| 4070 | const u8 *buf, size_t len, gfp_t gfp); | 4071 | const u8 *buf, size_t len, u32 flags, gfp_t gfp); |
| 4071 | 4072 | ||
| 4072 | /** | 4073 | /** |
| 4073 | * cfg80211_mgmt_tx_status - notification of TX status for management frame | 4074 | * cfg80211_mgmt_tx_status - notification of TX status for management frame |
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1f42bc3dcb9c..fde2c021b26d 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h | |||
| @@ -1493,6 +1493,9 @@ enum nl80211_commands { | |||
| 1493 | * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter | 1493 | * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter |
| 1494 | * field in the probe response (%NL80211_ATTR_PROBE_RESP). | 1494 | * field in the probe response (%NL80211_ATTR_PROBE_RESP). |
| 1495 | * | 1495 | * |
| 1496 | * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32. | ||
| 1497 | * As specified in the &enum nl80211_rxmgmt_flags. | ||
| 1498 | * | ||
| 1496 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 1499 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 1497 | * @__NL80211_ATTR_AFTER_LAST: internal use | 1500 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| 1498 | */ | 1501 | */ |
| @@ -1801,6 +1804,8 @@ enum nl80211_attrs { | |||
| 1801 | NL80211_ATTR_CSA_C_OFF_BEACON, | 1804 | NL80211_ATTR_CSA_C_OFF_BEACON, |
| 1802 | NL80211_ATTR_CSA_C_OFF_PRESP, | 1805 | NL80211_ATTR_CSA_C_OFF_PRESP, |
| 1803 | 1806 | ||
| 1807 | NL80211_ATTR_RXMGMT_FLAGS, | ||
| 1808 | |||
| 1804 | /* add attributes here, update the policy in nl80211.c */ | 1809 | /* add attributes here, update the policy in nl80211.c */ |
| 1805 | 1810 | ||
| 1806 | __NL80211_ATTR_AFTER_LAST, | 1811 | __NL80211_ATTR_AFTER_LAST, |
| @@ -3901,4 +3906,15 @@ enum nl80211_crit_proto_id { | |||
| 3901 | /* maximum duration for critical protocol measures */ | 3906 | /* maximum duration for critical protocol measures */ |
| 3902 | #define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */ | 3907 | #define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */ |
| 3903 | 3908 | ||
| 3909 | /** | ||
| 3910 | * enum nl80211_rxmgmt_flags - flags for received management frame. | ||
| 3911 | * | ||
| 3912 | * Used by cfg80211_rx_mgmt() | ||
| 3913 | * | ||
| 3914 | * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver. | ||
| 3915 | */ | ||
| 3916 | enum nl80211_rxmgmt_flags { | ||
| 3917 | NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0, | ||
| 3918 | }; | ||
| 3919 | |||
| 3904 | #endif /* __LINUX_NL80211_H */ | 3920 | #endif /* __LINUX_NL80211_H */ |
