diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
tree | e9e1348372b413e6b1b503209582b03c9005f614 /net/wireless/nl80211.h | |
parent | e57f1734d87aa0e9a00905ed08888f0c62f56227 (diff) | |
parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/wireless/nl80211.h')
-rw-r--r-- | net/wireless/nl80211.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h index cb0216e1a004..1e6df9630f42 100644 --- a/net/wireless/nl80211.h +++ b/net/wireless/nl80211.h @@ -8,10 +8,10 @@ void nl80211_exit(void); void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev); void nl80211_send_scan_start(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); -void nl80211_send_scan_done(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev); -void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev); +struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev, + struct wireless_dev *wdev, bool aborted); +void nl80211_send_scan_result(struct cfg80211_registered_device *rdev, + struct sk_buff *msg); void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev, struct net_device *netdev, u32 cmd); void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev, |