diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:39:27 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:39:27 (GMT) |
| commit | d3641409a05dcb8e28116bb2ad638f5a42805d9d (patch) | |
| tree | 1d43a5e0129709502edb631a4fd66de369ee5620 /net/wireless/core.h | |
| parent | 953c96e0d85615d1ab1f100e525d376053294dc2 (diff) | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
| download | linux-fsl-qoriq-d3641409a05dcb8e28116bb2ad638f5a42805d9d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index b5174f6..124e5e7 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -500,14 +500,12 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev, void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev, enum nl80211_iftype iftype, int num); - void cfg80211_leave(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); - #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10 #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS |