diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-18 13:47:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-18 13:47:13 -0500 |
| commit | 98d5fac2330779e6eea6431a90b44c7476260dcc (patch) | |
| tree | 99870656d835fc6c12093bc67517956cc7b3d6ec /net/wireless/nl80211.h | |
| parent | 4153577a8d318ae02b3791341e10e78416de402f (diff) | |
| parent | 9e97d14b4923da524d202f2e005d5d30b70db9d6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
Diffstat (limited to 'net/wireless/nl80211.h')
| -rw-r--r-- | net/wireless/nl80211.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h index 2acba8477e9d..b061da4919e1 100644 --- a/net/wireless/nl80211.h +++ b/net/wireless/nl80211.h @@ -108,6 +108,13 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev, struct net_device *netdev, enum nl80211_cqm_rssi_threshold_event rssi_event, gfp_t gfp); + +void +nl80211_radar_notify(struct cfg80211_registered_device *rdev, + struct cfg80211_chan_def *chandef, + enum nl80211_radar_event event, + struct net_device *netdev, gfp_t gfp); + void nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev, struct net_device *netdev, const u8 *peer, |