From owner-p4-projects@FreeBSD.ORG Tue Feb 3 23:03:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB3BA16A4DA; Tue, 3 Feb 2004 23:03:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94C9016A4D2 for ; Tue, 3 Feb 2004 23:03:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EECC43D45 for ; Tue, 3 Feb 2004 23:03:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1473n0B043124 for ; Tue, 3 Feb 2004 23:03:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1473mBL043121 for perforce@freebsd.org; Tue, 3 Feb 2004 23:03:48 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 3 Feb 2004 23:03:48 -0800 (PST) Message-Id: <200402040703.i1473mBL043121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 46465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2004 07:03:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=46465 Change 46465 by sam@sam_ebb on 2004/02/03 23:03:29 o s/PROTECTION/PROTMODE/ o bounds check transmit power setting o sync w/ madwifi Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#16 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#10 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#16 (text+ko) ==== @@ -897,7 +897,7 @@ case IEEE80211_IOC_RTSTHRESHOLD: ireq->i_val = ic->ic_rtsthreshold; break; - case IEEE80211_IOC_PROTECTION: + case IEEE80211_IOC_PROTMODE: ireq->i_val = ic->ic_protmode; break; case IEEE80211_IOC_TXPOWER: @@ -1054,9 +1054,9 @@ ic->ic_rtsthreshold = ireq->i_val; error = ieee80211_reset(ic); break; - case IEEE80211_IOC_PROTECTION: - if (!(IEEE80211_PROTECTION_OFF <= ireq->i_val && - ireq->i_val <= IEEE80211_PROTECTION_RTSCTS)) { + case IEEE80211_IOC_PROTMODE: + if (!(IEEE80211_PROTMODE_OFF <= ireq->i_val && + ireq->i_val <= IEEE80211_PROTMODE_RTSCTS)) { error = EINVAL; break; } @@ -1065,6 +1065,11 @@ break; case IEEE80211_IOC_TXPOWER: /* XXX units? */ + if (!(IEEE80211_TXPOWER_MIN <= ireq->i_val && + ireq->i_val <= IEEE80211_TXPOWER_MAX)) { + error = EINVAL; + break; + } ic->ic_bss->ni_txpower = ireq->i_val; error = ieee80211_reset(ic); break; ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#10 (text+ko) ==== @@ -164,11 +164,10 @@ #define IEEE80211_POWERSAVE_ON IEEE80211_POWERSAVE_CAM #define IEEE80211_IOC_POWERSAVESLEEP 11 #define IEEE80211_IOC_RTSTHRESHOLD 12 -#define IEEE80211_IOC_PROTECTION 13 -#define IEEE80211_PROTECTION_NOSUP -1 -#define IEEE80211_PROTECTION_OFF 0 -#define IEEE80211_PROTECTION_CTS 1 -#define IEEE80211_PROTECTION_RTSCTS 2 +#define IEEE80211_IOC_PROTMODE 13 +#define IEEE80211_PROTMODE_OFF 0 +#define IEEE80211_PROTMODE_CTS 1 +#define IEEE80211_PROTMODE_RTSCTS 2 #define IEEE80211_IOC_TXPOWER 14 #ifndef IEEE80211_CHAN_ANY @@ -190,7 +189,8 @@ enum { IEEE80211_PARAM_TURBO = 1, /* turbo mode */ IEEE80211_PARAM_MODE = 2, /* phy mode (11a, 11b, etc.) */ - IEEE80211_PARAM_AUTHMODE= 3 /* authentication mode */ + IEEE80211_PARAM_AUTHMODE= 3, /* authentication mode */ + IEEE80211_PARAM_PROTMODE= 4 /* 802.11g protection */ }; #define SIOCG80211STATS (SIOCDEVPRIVATE+2)