diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
| commit | 4b074b07625f603d40d4d04937f8874a00415dc4 (patch) | |
| tree | 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /Documentation/networking | |
| parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff) | |
| parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/regulatory.txt | 4 |
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 = { | |||
| 159 | REG_RULE(2412-20, 2484+20, 40, 6, 20, 0), | 159 | REG_RULE(2412-20, 2484+20, 40, 6, 20, 0), |
| 160 | /* IEEE 802.11a, channels 34..48 */ | 160 | /* IEEE 802.11a, channels 34..48 */ |
| 161 | REG_RULE(5170-20, 5240+20, 40, 6, 20, | 161 | REG_RULE(5170-20, 5240+20, 40, 6, 20, |
| 162 | NL80211_RRF_PASSIVE_SCAN), | 162 | NL80211_RRF_NO_IR), |
| 163 | /* IEEE 802.11a, channels 52..64 */ | 163 | /* IEEE 802.11a, channels 52..64 */ |
| 164 | REG_RULE(5260-20, 5320+20, 40, 6, 20, | 164 | REG_RULE(5260-20, 5320+20, 40, 6, 20, |
| 165 | NL80211_RRF_NO_IBSS | | 165 | NL80211_RRF_NO_IR| |
| 166 | NL80211_RRF_DFS), | 166 | NL80211_RRF_DFS), |
| 167 | } | 167 | } |
| 168 | }; | 168 | }; |