diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 13:51:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 13:51:40 -0400 |
| commit | f3e979a52c554f45e4ca6f01ca6933acef34b872 (patch) | |
| tree | 53aa9e61aa7fd0c225528fba4144b2d15f709ad9 /net/wireless/nl80211.h | |
| parent | cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc (diff) | |
| parent | a98655387762394371b88cdfb8215884757978ab (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/nl80211.h')
| -rw-r--r-- | net/wireless/nl80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h index 44341bf53cfc..2c0f2b3c07cb 100644 --- a/net/wireless/nl80211.h +++ b/net/wireless/nl80211.h @@ -66,7 +66,7 @@ void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev, int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev, u32 nlpid, int freq, int sig_dbm, - const u8 *buf, size_t len, gfp_t gfp); + const u8 *buf, size_t len, u32 flags, gfp_t gfp); void nl80211_radar_notify(struct cfg80211_registered_device *rdev, |