summaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-12-06 10:37:24 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-12-06 10:37:24 -0500
commitd86804cb70f93ca5e4c0fb13402962fbfb705c53 (patch)
treeca4e7da3541267ad909a2b73228406503e198ffa /Documentation/networking
parentd70f2cf520cf8c86c6b467fc5dcea524ec51dc2f (diff)
parente08fd975bf26aa8063cadd245817e042f570472d (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/regulatory.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt
index 9551622d0a7b..356f791af574 100644
--- a/Documentation/networking/regulatory.txt
+++ b/Documentation/networking/regulatory.txt
@@ -159,10 +159,10 @@ struct ieee80211_regdomain mydriver_jp_regdom = {
REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),
/* IEEE 802.11a, channels 34..48 */
REG_RULE(5170-20, 5240+20, 40, 6, 20,
- NL80211_RRF_PASSIVE_SCAN),
+ NL80211_RRF_NO_IR),
/* IEEE 802.11a, channels 52..64 */
REG_RULE(5260-20, 5320+20, 40, 6, 20,
- NL80211_RRF_NO_IBSS |
+ NL80211_RRF_NO_IR|
NL80211_RRF_DFS),
}
};