From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:51:10 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 B57B016A51D; Fri, 6 Apr 2007 16:51:10 +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 5F41116A4D0 for ; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F05013C484 for ; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) (envelope-from sam@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 l36GpA8x074708 for ; Fri, 6 Apr 2007 16:51:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36Gp9cd074699 for perforce@freebsd.org; Fri, 6 Apr 2007 16:51:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:51:09 GMT Message-Id: <200704061651.l36Gp9cd074699@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 Cc: Subject: PERFORCE change 117521 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: Fri, 06 Apr 2007 16:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=117521 Change 117521 by sam@sam_ebb on 2007/04/06 16:50:27 diff reduction: remove trailing whitespace Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#52 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#52 (text+ko) ==== @@ -41,8 +41,8 @@ #include #include -#include - +#include + #include #include @@ -246,7 +246,7 @@ void ieee80211_print_essid(const u_int8_t *essid, int len) { - const u_int8_t *p; + const u_int8_t *p; int i; if (len > IEEE80211_NWID_LEN) @@ -546,76 +546,76 @@ * WME protocol support. The following parameters come from the spec. */ typedef struct phyParamType { - u_int8_t aifsn; + u_int8_t aifsn; u_int8_t logcwmin; - u_int8_t logcwmax; + u_int8_t logcwmax; u_int16_t txopLimit; u_int8_t acm; } paramType; static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = { { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11A */ - { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_11B */ - { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11G */ - { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_FH */ - { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_BK[IEEE80211_MODE_MAX] = { { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ - { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ - { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ - { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ - { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VI[IEEE80211_MODE_MAX] = { { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ - { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ - { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ - { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ - { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VO[IEEE80211_MODE_MAX] = { { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ - { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ - { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ - { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ - { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_BE[IEEE80211_MODE_MAX] = { { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ - { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ - { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ - { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ - { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VI[IEEE80211_MODE_MAX] = { { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ - { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ - { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ - { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ - { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VO[IEEE80211_MODE_MAX] = { { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ - { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ - { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ - { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; void @@ -725,13 +725,13 @@ ieee80211_wme_updateparams_locked(struct ieee80211com *ic) { static const paramType phyParam[IEEE80211_MODE_MAX] = { - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11A */ - { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_11B */ - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11G */ - { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_FH */ - { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_AUTO */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11A */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_11B */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11G */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_FH */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_G */ }; struct ieee80211_wme_state *wme = &ic->ic_wme; const struct wmeParams *wmep; @@ -877,7 +877,7 @@ * we should be able to apply any new state/parameters * simply by re-associating. Otherwise we need to * re-scan to select an appropriate ap. - */ + */ if (ic->ic_state != IEEE80211_S_RUN || forcescan) ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); else @@ -967,7 +967,7 @@ } ic->ic_bmiss_count = 0; if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) { - /* + /* * If we receive a beacon miss interrupt when using * dynamic turbo, attempt to switch modes before * reassociating.