From owner-p4-projects@FreeBSD.ORG Wed Jan 3 08:06: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 20D6216A40F; Wed, 3 Jan 2007 08:06: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 E2B2516A403 for ; Wed, 3 Jan 2007 08:06:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D414913C45E for ; Wed, 3 Jan 2007 08:06:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l03869cl097902 for ; Wed, 3 Jan 2007 08:06:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l03869D4097899 for perforce@freebsd.org; Wed, 3 Jan 2007 08:06:09 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 3 Jan 2007 08:06:09 GMT Message-Id: <200701030806.l03869D4097899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112446 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: Wed, 03 Jan 2007 08:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=112446 Change 112446 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/03 08:05:15 use net80211 layer support for channel initialization Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#18 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#18 (text+ko) ==== @@ -72,6 +72,7 @@ #include #include +#include #include #include @@ -257,9 +258,8 @@ struct iwi_softc *sc = device_get_softc(dev); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_channel *c; uint16_t val; - int error, i, j; + int error, bands; sc->sc_dev = dev; @@ -409,41 +409,12 @@ ic->ic_myaddr[4] = val & 0xff; ic->ic_myaddr[5] = val >> 8; - /* set supported .11b and .11g channels (1 through 14) */ - for (j = 0, i = 1; i <= 14; i++) { - c = &ic->ic_channels[j++]; - c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - c->ic_flags = IEEE80211_CHAN_B; - c->ic_ieee = i; - c = &ic->ic_channels[j++]; - c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - c->ic_flags = IEEE80211_CHAN_G; - c->ic_ieee = i; - - } - if (pci_get_device(dev) >= 0x4223) { - /* set supported .11a rates (2915ABG only) */ - ic->ic_sup_rates[IEEE80211_MODE_11A] = iwi_rateset_11a; - - /* set supported .11a channels */ - for (i = 36; i <= 64; i += 4, j++) { - ic->ic_channels[j].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[j].ic_flags = IEEE80211_CHAN_A; - ic->ic_channels[j].ic_ieee = i; - } - for (i = 149; i <= 165; i += 4, j++) { - ic->ic_channels[j].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[j].ic_flags = IEEE80211_CHAN_A; - ic->ic_channels[j].ic_ieee = i; - } - } - - /* set supported .11b and .11g rates */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = iwi_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = iwi_rateset_11g; - ic->ic_nchans = j; + bands = 0; + setbit(&bands, IEEE80211_MODE_11B); + setbit(&bands, IEEE80211_MODE_11G); + if (pci_get_device(dev) >= 0x4223) + setbit(&bands, IEEE80211_MODE_11A); + ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); ieee80211_ifattach(ic); ic->ic_bmissthreshold = 10; /* override default */