From owner-p4-projects@FreeBSD.ORG Fri Jun 29 07:49:46 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 0427116A421; Fri, 29 Jun 2007 07:49:46 +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 C4DD616A400 for ; Fri, 29 Jun 2007 07:49:45 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B486113C45D for ; Fri, 29 Jun 2007 07:49:45 +0000 (UTC) (envelope-from thompsa@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 l5T7njxu069450 for ; Fri, 29 Jun 2007 07:49:45 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T7njeO069447 for perforce@freebsd.org; Fri, 29 Jun 2007 07:49:45 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jun 2007 07:49:45 GMT Message-Id: <200706290749.l5T7njeO069447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122522 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, 29 Jun 2007 07:49:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122522 Change 122522 by thompsa@thompsa_heff on 2007/06/29 07:49:08 - Remove temporary debugging - catch up with bchan/curchan Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#37 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#37 (text+ko) ==== @@ -192,7 +192,7 @@ #define WI_DEBUG #ifdef WI_DEBUG -static int wi_debug = 100; +static int wi_debug = 0; SYSCTL_INT(_hw_wi, OID_AUTO, debug, CTLFLAG_RW, &wi_debug, 0, "control debugging printfs"); @@ -678,7 +678,6 @@ int error = 0, wasenabled; - DPRINTF(("%s\n", __func__)); if (sc->wi_gone) return; @@ -884,7 +883,6 @@ ieee80211_new_state(ic, IEEE80211_S_INIT, -1); - DPRINTF(("%s\n", __func__)); DELAY(100000); WI_LOCK(sc); if (sc->sc_enabled && !sc->wi_gone) { @@ -1059,7 +1057,6 @@ } sc->sc_txd[cur].d_len = off; if (sc->sc_txcur == cur) { - DPRINTF2(("%s: xmit frame, idx=%d\n", __func__, cur)); if (wi_cmd(sc, WI_CMD_TX | WI_RECLAIM, fid, 0, 0)) { if_printf(ifp, "xmit failed\n"); sc->sc_txd[cur].d_len = 0; @@ -1169,7 +1166,6 @@ int error = 0; int tries; - DPRINTF(("%s\n", __func__)); /* Symbol firmware cannot be initialized more than once */ if (sc->sc_firmware_type == WI_SYMBOL && sc->sc_reset) return (0); @@ -2558,7 +2554,6 @@ u_int16_t val; struct wi_key wkey[IEEE80211_WEP_NKID]; - DPRINTF(("%s\n", __func__)); switch (sc->sc_firmware_type) { case WI_LUCENT: val = (ic->ic_flags & IEEE80211_F_PRIVACY) ? 1 : 0; @@ -2669,8 +2664,6 @@ { int i, s = 0; - DPRINTF2(("%s: cmd=%d val0=%d val1=%d val2=%d\n", - __func__, cmd, val0, val1, val2)); if (sc->wi_gone) return (ENODEV); @@ -3017,7 +3010,6 @@ int error = 0; u_int16_t val[2]; - DPRINTF(("%s\n", __func__)); if (!sc->sc_enabled) return ENXIO; switch (sc->sc_firmware_type) { @@ -3060,7 +3052,6 @@ struct ieee80211com *ic; uint8_t ssid[2+IEEE80211_NWID_LEN]; - DPRINTF(("%s\n", __func__)); ic = &sc->sc_ic; rstamp++; memset(&sp, 0, sizeof(sp)); @@ -3128,11 +3119,12 @@ sp.ssid = (uint8_t *)&ssid[0]; memcpy(sp.ssid + 2, ap->name, ap->namelen); sp.ssid[1] = ap->namelen; - sp.chan = ieee80211_find_channel(ic, + sp.bchan = ap->channel; + sp.curchan = ieee80211_find_channel(ic, ieee80211_ieee2mhz(ap->channel, IEEE80211_CHAN_B), IEEE80211_CHAN_B); - if (sp.chan == NULL) - sp.chan = &ic->ic_channels[0]; + if (sp.curchan == NULL) + sp.curchan = &ic->ic_channels[0]; sp.rates = &rates[0]; sp.tstamp = (uint8_t *)&rstamp; DPRINTF(("calling add_scan, bssid %s chan %d signal %d\n", @@ -3543,7 +3535,6 @@ struct ifnet *ifp = ic->ic_ifp; struct wi_softc *sc = ifp->if_softc; - DPRINTF(("%s\n", __func__)); WI_LOCK(sc); sc->sc_flags |= WI_FLAGS_SCANNING; wi_scan_ap(sc, 0x3fff, 0x000f);