diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-28 14:41:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-28 14:41:15 -0400 |
| commit | cec381919818a9a0cb85600b3c82404bdd38cf36 (patch) | |
| tree | bd6bbd9b5d777ed223476d5f7304d6197413a543 /net/wireless/nl80211.h | |
| parent | 2d2ab658d2debcb4c0e29c9e6f18e5683f3077bf (diff) | |
| parent | b34939b9836950d261610132853311054b507247 (diff) | |
Merge tag 'mac80211-next-for-davem-2017-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of patches for -next:
* API support for concurrent scheduled scan requests
* API changes for roaming reporting
* BSS max idle support in mac80211
* API changes for TX status reporting in mac80211
* API changes for RX rate reporting in mac80211
* rewrite monitor logic to prepare for BPF filters
* bugfix for rare devices without 2.4 GHz support
* a bugfix for recent DFS changes
* some further cleanups
The API changes are actually at a nice time, since it's
typically quiet just before the merge window, and trees
can be synchronized easily during it.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/nl80211.h')
| -rw-r--r-- | net/wireless/nl80211.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h index d5f6860e62ab..b96933322077 100644 --- a/net/wireless/nl80211.h +++ b/net/wireless/nl80211.h @@ -56,9 +56,8 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, struct cfg80211_connect_resp_params *params, gfp_t gfp); void nl80211_send_roamed(struct cfg80211_registered_device *rdev, - struct net_device *netdev, const u8 *bssid, - const u8 *req_ie, size_t req_ie_len, - const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp); + struct net_device *netdev, + struct cfg80211_roam_info *info, gfp_t gfp); void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, struct net_device *netdev, u16 reason, const u8 *ie, size_t ie_len, bool from_ap); |