diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
| commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
| tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /net/wireless | |
| parent | c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index bcc7d7ee5a51..b75756b05af7 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -141,9 +141,8 @@ static const struct ieee80211_regdomain world_regdom = { | |||
| 141 | .reg_rules = { | 141 | .reg_rules = { |
| 142 | /* IEEE 802.11b/g, channels 1..11 */ | 142 | /* IEEE 802.11b/g, channels 1..11 */ |
| 143 | REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), | 143 | REG_RULE(2412-10, 2462+10, 40, 6, 20, 0), |
| 144 | /* IEEE 802.11b/g, channels 12..13. No HT40 | 144 | /* IEEE 802.11b/g, channels 12..13. */ |
| 145 | * channel fits here. */ | 145 | REG_RULE(2467-10, 2472+10, 40, 6, 20, |
| 146 | REG_RULE(2467-10, 2472+10, 20, 6, 20, | ||
| 147 | NL80211_RRF_PASSIVE_SCAN | | 146 | NL80211_RRF_PASSIVE_SCAN | |
| 148 | NL80211_RRF_NO_IBSS), | 147 | NL80211_RRF_NO_IBSS), |
| 149 | /* IEEE 802.11 channel 14 - Only JP enables | 148 | /* IEEE 802.11 channel 14 - Only JP enables |