From owner-freebsd-net@freebsd.org Tue Feb 2 09:06:14 2016 Return-Path: Delivered-To: freebsd-net@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 737E5A9764A for ; Tue, 2 Feb 2016 09:06:14 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from phabric-backend.rbsd.freebsd.org (unknown [IPv6:2607:fc50:2000:101::1bb:73]) by mx1.freebsd.org (Postfix) with ESMTP id 5221D92B for ; Tue, 2 Feb 2016 09:06:14 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by phabric-backend.rbsd.freebsd.org (Postfix, from userid 1346) id 4DFBC107678; Tue, 2 Feb 2016 09:06:14 +0000 (UTC) Date: Tue, 2 Feb 2016 09:06:14 +0000 To: freebsd-net@freebsd.org From: "mugius.0x101.freebsd_gmail.com (Mugenga Marius)" Reply-to: D5165+325+ebe40adb3bf8170b@reviews.freebsd.org Subject: [Differential] [Request, 9 lines] D5165: [patch] dev/bwn suppressing "bwn0: unsupported rate 0" console messages Message-ID: X-Priority: 3 X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , , Thread-Topic: D5165: [patch] dev/bwn suppressing "bwn0: unsupported rate 0" console messages X-Herald-Rules: <28> X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: X-Phabricator-Cc: Precedence: bulk Thread-Index: ZWFmNDNmM2JhYmZjMTE4OGFlOGQ2ZmM4Y2Y1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_76207cb7079bc6e6e2274d49843006df" X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.20 List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2016 09:06:14 -0000 --b1_76207cb7079bc6e6e2274d49843006df Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit mugius.0x101.freebsd_gmail.com created this revision. mugius.0x101.freebsd_gmail.com added a reviewer: network. mugius.0x101.freebsd_gmail.com added a subscriber: freebsd-net-list. mugius.0x101.freebsd_gmail.com set the repository for this revision to rS FreeBSD src repository. Herald added a subscriber: imp. REVISION SUMMARY Update to PR206199 REPOSITORY rS FreeBSD src repository REVISION DETAIL https://reviews.freebsd.org/D5165 AFFECTED FILES head/sys/dev/bwn/if_bwn.c CHANGE DETAILS diff --git a/head/sys/dev/bwn/if_bwn.c b/head/sys/dev/bwn/if_bwn.c --- a/head/sys/dev/bwn/if_bwn.c +++ b/head/sys/dev/bwn/if_bwn.c @@ -9467,7 +9467,7 @@ struct mbuf *mprot; unsigned int len; uint32_t macctl = 0; - int protdur, rts_rate, rts_rate_fb, ismcast, isshort, rix, type; + int protdur, rts_rate, rts_rate_fb, ismcast, isshort, nrates, type; uint16_t phyctl = 0; uint8_t rate, rate_fb; @@ -9489,11 +9489,12 @@ else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = rate_fb = tp->ucastrate; else { - rix = ieee80211_ratectl_rate(ni, NULL, 0); + ieee80211_ratectl_rate(ni, NULL, 0); + nrates = ni->ni_rates.rs_nrates; rate = ni->ni_txrate; - if (rix > 0) - rate_fb = ni->ni_rates.rs_rates[rix - 1] & + if (nrates > 0) + rate_fb = ni->ni_rates.rs_rates[nrates - 1] & IEEE80211_RATE_VAL; else rate_fb = rate; EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: mugius.0x101.freebsd_gmail.com, network Cc: imp, freebsd-net-list --b1_76207cb7079bc6e6e2274d49843006df Content-Type: text/x-patch; charset=utf-8; name="D5165.12945.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5165.12945.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL2Rldi9id24vaWZfYnduLmMgYi9oZWFkL3N5cy9kZXYvYndu L2lmX2J3bi5jCi0tLSBhL2hlYWQvc3lzL2Rldi9id24vaWZfYnduLmMKKysrIGIvaGVhZC9zeXMv ZGV2L2J3bi9pZl9id24uYwpAQCAtOTQ2Nyw3ICs5NDY3LDcgQEAKIAlzdHJ1Y3QgbWJ1ZiAqbXBy b3Q7CiAJdW5zaWduZWQgaW50IGxlbjsKIAl1aW50MzJfdCBtYWNjdGwgPSAwOwotCWludCBwcm90 ZHVyLCBydHNfcmF0ZSwgcnRzX3JhdGVfZmIsIGlzbWNhc3QsIGlzc2hvcnQsIHJpeCwgdHlwZTsK KwlpbnQgcHJvdGR1ciwgcnRzX3JhdGUsIHJ0c19yYXRlX2ZiLCBpc21jYXN0LCBpc3Nob3J0LCBu cmF0ZXMsIHR5cGU7CiAJdWludDE2X3QgcGh5Y3RsID0gMDsKIAl1aW50OF90IHJhdGUsIHJhdGVf ZmI7CiAKQEAgLTk0ODksMTEgKzk0ODksMTIgQEAKIAllbHNlIGlmICh0cC0+dWNhc3RyYXRlICE9 IElFRUU4MDIxMV9GSVhFRF9SQVRFX05PTkUpCiAJCXJhdGUgPSByYXRlX2ZiID0gdHAtPnVjYXN0 cmF0ZTsKIAllbHNlIHsKLQkJcml4ID0gaWVlZTgwMjExX3JhdGVjdGxfcmF0ZShuaSwgTlVMTCwg MCk7CisJCWllZWU4MDIxMV9yYXRlY3RsX3JhdGUobmksIE5VTEwsIDApOworCQlucmF0ZXMgPSBu aS0+bmlfcmF0ZXMucnNfbnJhdGVzOwogCQlyYXRlID0gbmktPm5pX3R4cmF0ZTsKIAotCQlpZiAo cml4ID4gMCkKLQkJCXJhdGVfZmIgPSBuaS0+bmlfcmF0ZXMucnNfcmF0ZXNbcml4IC0gMV0gJgor CQlpZiAobnJhdGVzID4gMCkKKwkJCXJhdGVfZmIgPSBuaS0+bmlfcmF0ZXMucnNfcmF0ZXNbbnJh dGVzIC0gMV0gJgogCQkJICAgIElFRUU4MDIxMV9SQVRFX1ZBTDsKIAkJZWxzZQogCQkJcmF0ZV9m YiA9IHJhdGU7Cgo= --b1_76207cb7079bc6e6e2274d49843006df--