瀏覽代碼

wireless: Fix WARN_ON() with ieee802.11b

When the driver registers a IEEE80211_BAND_2GHZ band,
it can either be 802.11b or 802.11g. But when 802.11b rates
are registered "want" will be 3 (since 4 rates are being registered,
and each of those 4 rates will decrease "want").
Since this is a correct situation, there is no need to trigger
a WARN_ON() for this.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Ivo van Doorn 17 年之前
父節點
當前提交
406f2388cc
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      net/wireless/util.c

+ 1 - 1
net/wireless/util.c

@@ -80,7 +80,7 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
 				sband->bitrates[i].flags |=
 				sband->bitrates[i].flags |=
 					IEEE80211_RATE_ERP_G;
 					IEEE80211_RATE_ERP_G;
 		}
 		}
-		WARN_ON(want != 0 && want != 6);
+		WARN_ON(want != 0 && want != 3 && want != 6);
 		break;
 		break;
 	case IEEE80211_NUM_BANDS:
 	case IEEE80211_NUM_BANDS:
 		WARN_ON(1);
 		WARN_ON(1);