diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
| commit | 4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a (patch) | |
| tree | 52046049957a87103a383869155f43461963f089 /net/wireless | |
| parent | f3f66b69c8ff08b46975d9e99c7ecb92a8b12eda (diff) | |
| parent | 7a4a77b7771164d61ce702a588067d1e1d66db7c (diff) | |
| download | op-kernel-dev-4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a.zip op-kernel-dev-4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/iface.c
Diffstat (limited to 'net/wireless')
| -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 ab29a61..89c3e68 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1690,7 +1690,7 @@ int regulatory_hint_user(const char *alpha2) request->wiphy_idx = WIPHY_IDX_STALE; request->alpha2[0] = alpha2[0]; request->alpha2[1] = alpha2[1]; - request->initiator = NL80211_REGDOM_SET_BY_USER, + request->initiator = NL80211_REGDOM_SET_BY_USER; queue_regulatory_request(request); |
