From owner-svn-src-head@FreeBSD.ORG Thu Oct 31 09:20:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0BF749EF; Thu, 31 Oct 2013 09:20:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF6242C49; Thu, 31 Oct 2013 09:20:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9V9KUu0013164; Thu, 31 Oct 2013 09:20:30 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9V9KU3i013163; Thu, 31 Oct 2013 09:20:30 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201310310920.r9V9KU3i013163@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 31 Oct 2013 09:20:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257429 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 09:20:31 -0000 Author: hselasky Date: Thu Oct 31 09:20:30 2013 New Revision: 257429 URL: http://svnweb.freebsd.org/changeset/base/257429 Log: Fix some types. Compilation for external target complains that "u_int" is not idential to "uint32_t" when defining set channel prototype functions. The WLAN channel range should be from 0 to 65535 inclusivly, and u_int should be fine for this purpose. Modified: head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Thu Oct 31 09:03:42 2013 (r257428) +++ head/sys/dev/usb/wlan/if_run.c Thu Oct 31 09:20:30 2013 (r257429) @@ -320,7 +320,7 @@ static usb_callback_t run_bulk_tx_callba static usb_callback_t run_bulk_tx_callback5; static void run_bulk_tx_callbackN(struct usb_xfer *xfer, - usb_error_t error, unsigned int index); + usb_error_t error, u_int index); static struct ieee80211vap *run_vap_create(struct ieee80211com *, const char [IFNAMSIZ], int, enum ieee80211_opmode, int, const uint8_t [IEEE80211_ADDR_LEN], @@ -426,7 +426,7 @@ static int run_txrx_enable(struct run_so static void run_init(void *); static void run_init_locked(struct run_softc *); static void run_stop(void *); -static void run_delay(struct run_softc *, unsigned int); +static void run_delay(struct run_softc *, u_int); static const struct { uint16_t reg; @@ -2724,7 +2724,7 @@ run_tx_free(struct run_endpoint_queue *p } static void -run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, unsigned int index) +run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index) { struct run_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = sc->sc_ifp; @@ -3576,7 +3576,7 @@ run_select_chan_group(struct run_softc * } static void -run_rt2870_set_chan(struct run_softc *sc, uint32_t chan) +run_rt2870_set_chan(struct run_softc *sc, u_int chan) { const struct rfprog *rfprog = rt2860_rf2850; uint32_t r2, r3, r4; @@ -3631,7 +3631,7 @@ run_rt2870_set_chan(struct run_softc *sc } static void -run_rt3070_set_chan(struct run_softc *sc, uint32_t chan) +run_rt3070_set_chan(struct run_softc *sc, u_int chan) { int8_t txpow1, txpow2; uint8_t rf; @@ -3868,7 +3868,7 @@ static int run_set_chan(struct run_softc *sc, struct ieee80211_channel *c) { struct ieee80211com *ic = sc->sc_ifp->if_l2com; - uint32_t chan, group; + u_int chan, group; chan = ieee80211_chan2ieee(ic, c); if (chan == 0 || chan == IEEE80211_CHAN_ANY) @@ -4310,7 +4310,7 @@ run_rssi2dbm(struct run_softc *sc, uint8 int delta; if (IEEE80211_IS_CHAN_5GHZ(c)) { - uint32_t chan = ieee80211_chan2ieee(ic, c); + u_int chan = ieee80211_chan2ieee(ic, c); delta = sc->rssi_5ghz[rxchain]; /* determine channel group */ @@ -4974,7 +4974,7 @@ run_stop(void *arg) } static void -run_delay(struct run_softc *sc, unsigned int ms) +run_delay(struct run_softc *sc, u_int ms) { usb_pause_mtx(mtx_owned(&sc->sc_mtx) ? &sc->sc_mtx : NULL, USB_MS_TO_TICKS(ms));