From owner-p4-projects@FreeBSD.ORG Sat Oct 18 23:12:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A3771065691; Sat, 18 Oct 2008 23:12:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D621106568F for ; Sat, 18 Oct 2008 23:12:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B9518FC12 for ; Sat, 18 Oct 2008 23:12:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INCtBP076317 for ; Sat, 18 Oct 2008 23:12:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INCseH076315 for perforce@freebsd.org; Sat, 18 Oct 2008 23:12:54 GMT (envelope-from sam@freebsd.org) Date: Sat, 18 Oct 2008 23:12:54 GMT Message-Id: <200810182312.m9INCseH076315@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 151523 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: Sat, 18 Oct 2008 23:12:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=151523 Change 151523 by sam@sam_ebb on 2008/10/18 23:12:24 remove explicit call to driver newassoc callback; it should no longer been needed now that net80211 does it Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#24 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#17 edit .. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#11 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#41 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#40 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#29 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#31 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#24 (text+kox) ==== @@ -3645,11 +3645,6 @@ return error; } - if (ic->ic_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - iwn_newassoc(ni, 1); - } - error = iwn_init_sensitivity(sc); if (error != 0) { device_printf(sc->sc_dev, ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#17 (text+ko) ==== @@ -4573,8 +4573,6 @@ mwl_hal_setassocid(hvap, ni->ni_bssid, ni->ni_associd); mwl_setrates(vap); mwl_hal_setrtsthreshold(hvap, vap->iv_rtsthreshold); - /* NB: net80211 doesn't call back; do it explicitly */ - mwl_newassoc(ni, 1); break; case IEEE80211_M_WDS: DPRINTF(sc, MWL_DEBUG_STATE, "%s: %s: bssid %s\n", ==== //depot/projects/vap/sys/dev/ral/if_ral_pci.c#11 (text+ko) ==== ==== //depot/projects/vap/sys/dev/ral/rt2560.c#41 (text) ==== @@ -831,13 +831,8 @@ /* turn assocation led on */ rt2560_update_led(sc, 1, 0); - if (vap->iv_opmode != IEEE80211_M_MONITOR) { - if (vap->iv_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - rt2560_newassoc(ni, 1); - } + if (vap->iv_opmode != IEEE80211_M_MONITOR) rt2560_enable_tsf_sync(sc); - } } return error; } ==== //depot/projects/vap/sys/dev/ral/rt2661.c#40 (text) ==== @@ -878,13 +878,8 @@ if (error != 0) return error; } - if (vap->iv_opmode != IEEE80211_M_MONITOR) { - if (vap->iv_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - rt2661_newassoc(ni, 1); - } + if (vap->iv_opmode != IEEE80211_M_MONITOR) rt2661_enable_tsf_sync(sc); - } } return error; } ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#29 (text+ko) ==== @@ -740,11 +740,6 @@ IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid); zyd_set_bssid(sc, sc->sc_bssid); } - - if (vap->iv_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - zyd_newassoc(ni, 1); - } break; } default: ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#31 (text+ko) ==== @@ -2522,11 +2522,6 @@ return error; } - if (vap->iv_opmode == IEEE80211_M_STA) { - /* fake a join to init the tx rate */ - wpi_newassoc(ni, 1); - } - /* link LED always on while associated */ wpi_set_led(sc, WPI_LED_LINK, 0, 1);