diff options
| author | John W. Linville | 2014-02-13 20:43:02 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-02-13 20:43:02 +0100 |
| commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
| tree | e9e1348372b413e6b1b503209582b03c9005f614 /net/wireless/core.h | |
| parent | mwifiex: add key material v2 support (diff) | |
| parent | rtl8180: Add error check for pci_map_single return value in TX path (diff) | |
| download | kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.gz kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.xz kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 9895ab16c051..40683004d523 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -62,6 +62,7 @@ struct cfg80211_registered_device { struct rb_root bss_tree; u32 bss_generation; struct cfg80211_scan_request *scan_req; /* protected by RTNL */ + struct sk_buff *scan_msg; struct cfg80211_sched_scan_request *sched_scan_req; unsigned long suspend_at; struct work_struct scan_done_wk; @@ -363,7 +364,8 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev, struct key_params *params, int key_idx, bool pairwise, const u8 *mac_addr); void __cfg80211_scan_done(struct work_struct *wk); -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev); +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, + bool send_message); void __cfg80211_sched_scan_results(struct work_struct *wk); int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, bool driver_initiated); |