From owner-p4-projects@FreeBSD.ORG Tue Mar 27 14:26:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC5F716A404; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62DA116A402 for ; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5404313C45B for ; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2REQb86034733 for ; Tue, 27 Mar 2007 14:26:37 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2REQbhq034725 for perforce@freebsd.org; Tue, 27 Mar 2007 14:26:37 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 27 Mar 2007 14:26:37 GMT Message-Id: <200703271426.l2REQbhq034725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 116648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 14:26:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=116648 Change 116648 by sephe@sephe_zealot:sam_wifi on 2007/03/27 14:26:25 Grrr... Style changes. Sorry. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#97 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#97 (text+ko) ==== @@ -2102,10 +2102,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); - if (scan.xrates != NULL) { + if (scan.xrates != NULL) IEEE80211_VERIFY_ELEMENT(scan.xrates, IEEE80211_RATE_MAXSIZE - scan.rates[1]); - } IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); #if IEEE80211_CHAN_MAX < 255 if (scan.chan > IEEE80211_CHAN_MAX) { @@ -2346,10 +2345,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { @@ -2542,10 +2540,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); @@ -2790,10 +2787,9 @@ } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_JOIN | IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |