diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-06 20:58:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 20:58:41 +0100 |
| commit | 403e16731ffddc097eae89f53f9a7b0f0c9769c4 (patch) | |
| tree | 228d17985ad8ea22a7763457bf9641eb44781568 /net/wireless/reg.c | |
| parent | Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | cfg80211: fix channel error on mesh join (diff) | |
| download | linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.tar.xz linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index b75756b05af7..6e5308998e30 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1796,7 +1796,7 @@ EXPORT_SYMBOL(regulatory_hint); */ void regulatory_hint_11d(struct wiphy *wiphy, enum ieee80211_band band, - u8 *country_ie, + const u8 *country_ie, u8 country_ie_len) { char alpha2[2]; |