Commit c3826807 authored by Johannes Berg's avatar Johannes Berg
Browse files

regulatory: fix world regulatory domain data 



The rule definitions here aren't really valid, they would
be rejected if it came from userspace due to the bandwidth
specified being bigger than the rule's width.

This is fairly much inconsequential since the other rules
around them do enable the bandwidth, but express that better
using the NL80211_RRF_AUTO_BW flag.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 94c4fd64

net/wireless/reg.c

+7 −5
Original line number Diff line number Diff line
@@ -231,20 +231,22 @@ static const struct ieee80211_regdomain world_regdom = { 
		/* IEEE 802.11b/g, channels 1..11 */

		REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),

		/* IEEE 802.11b/g, channels 12..13. */

		REG_RULE(2467-10, 2472+10, 40, 6, 20,

			NL80211_RRF_NO_IR),

		REG_RULE(2467-10, 2472+10, 20, 6, 20,

			NL80211_RRF_NO_IR | NL80211_RRF_AUTO_BW),

		/* IEEE 802.11 channel 14 - Only JP enables

		 * this and for 802.11b only */

		REG_RULE(2484-10, 2484+10, 20, 6, 20,

			NL80211_RRF_NO_IR |

			NL80211_RRF_NO_OFDM),

		/* IEEE 802.11a, channel 36..48 */

		REG_RULE(5180-10, 5240+10, 160, 6, 20,

                        NL80211_RRF_NO_IR),

		REG_RULE(5180-10, 5240+10, 80, 6, 20,

                        NL80211_RRF_NO_IR |

                        NL80211_RRF_AUTO_BW),



		/* IEEE 802.11a, channel 52..64 - DFS required */

		REG_RULE(5260-10, 5320+10, 160, 6, 20,

		REG_RULE(5260-10, 5320+10, 80, 6, 20,

			NL80211_RRF_NO_IR |

			NL80211_RRF_AUTO_BW |

			NL80211_RRF_DFS),



		/* IEEE 802.11a, channel 100..144 - DFS required */

CRA Git | Maintained and supported by SUSTech CRA and CCSE