subject:"svn commit\: r228621 \- in head\/sys\: dev\/an dev\/ath dev\/bwi dev\/bwn dev\/if_ndis dev\/ipw dev\/iwi dev\/iwn dev\/malo dev\/mwl dev\/ral dev\/usb\/wlan dev\/wi dev\/wpi net80211"

svn commit: r228621 - in head/sys: dev/an dev/ath dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi net80211

2011-12-17 Thread Bernhard Schmidt

Author: bschmidt
Date: Sat Dec 17 10:23:17 2011
New Revision: 228621
URL: http://svn.freebsd.org/changeset/base/228621

Log:
  Fix some net80211 enum nits:
  - ic_vap_create() uses an ieee80211_opmode argument
  - ieee80211_rate2media() takes an ieee80211_phymode argument
  - ieee80211_plcp2rate() takes an ieee80211_phytype argument
  - cast to enum ieee80211_protmode and ieee80211_roamingmode to silence
compiler warnings
  
  Submitted by: arundel@

Modified:
  head/sys/dev/an/if_an.c
  head/sys/dev/ath/if_ath.c
  head/sys/dev/bwi/if_bwi.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/if_ndis/if_ndis.c
  head/sys/dev/ipw/if_ipw.c
  head/sys/dev/iwi/if_iwi.c
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/malo/if_malo.c
  head/sys/dev/mwl/if_mwl.c
  head/sys/dev/ral/rt2560.c
  head/sys/dev/ral/rt2661.c
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_zyd.c
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wpi/if_wpi.c
  head/sys/net80211/ieee80211.c
  head/sys/net80211/ieee80211_ht.c
  head/sys/net80211/ieee80211_ioctl.c
  head/sys/net80211/ieee80211_var.h

Modified: head/sys/dev/an/if_an.c
==
--- head/sys/dev/an/if_an.c Sat Dec 17 06:57:35 2011(r228620)
+++ head/sys/dev/an/if_an.c Sat Dec 17 10:23:17 2011(r228621)
@@ -797,7 +797,7 @@ an_attach(struct an_softc *sc, int flags
ADD(IFM_AUTO, IFM_IEEE80211_ADHOC);
for (i = 0; i  nrate; i++) {
r = sc-an_caps.an_rates[i];
-   mword = ieee80211_rate2media(NULL, r, IEEE80211_T_DS);
+   mword = ieee80211_rate2media(NULL, r, IEEE80211_MODE_AUTO);
if (mword == 0)
continue;
printf(%s%d%sMbps, (i != 0 ?   : ),
@@ -3299,7 +3299,7 @@ an_media_status(struct ifnet *ifp, struc
if (sc-an_config.an_opmode == AN_OPMODE_IBSS_ADHOC)
imr-ifm_active |= IFM_IEEE80211_ADHOC;
imr-ifm_active |= ieee80211_rate2media(NULL,
-   status.an_current_tx_rate, IEEE80211_T_DS);
+   status.an_current_tx_rate, IEEE80211_MODE_AUTO);
imr-ifm_status = IFM_AVALID;
if (status.an_opmode  AN_STATUS_OPMODE_ASSOCIATED)
imr-ifm_status |= IFM_ACTIVE;

Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c   Sat Dec 17 06:57:35 2011(r228620)
+++ head/sys/dev/ath/if_ath.c   Sat Dec 17 10:23:17 2011(r228621)
@@ -128,9 +128,9 @@ __FBSDID($FreeBSD$);
 CTASSERT(ATH_BCBUF = 8);
 
 static struct ieee80211vap *ath_vap_create(struct ieee80211com *,
-   const char name[IFNAMSIZ], int unit, int opmode,
-   int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
-   const uint8_t mac[IEEE80211_ADDR_LEN]);
+   const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
+   const uint8_t [IEEE80211_ADDR_LEN],
+   const uint8_t [IEEE80211_ADDR_LEN]);
 static voidath_vap_delete(struct ieee80211vap *);
 static voidath_init(void *);
 static voidath_stop_locked(struct ifnet *);
@@ -885,16 +885,17 @@ assign_bslot(struct ath_softc *sc)
 }
 
 static struct ieee80211vap *
-ath_vap_create(struct ieee80211com *ic,
-   const char name[IFNAMSIZ], int unit, int opmode, int flags,
-   const uint8_t bssid[IEEE80211_ADDR_LEN],
-   const uint8_t mac0[IEEE80211_ADDR_LEN])
+ath_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
+enum ieee80211_opmode opmode, int flags,
+const uint8_t bssid[IEEE80211_ADDR_LEN],
+const uint8_t mac0[IEEE80211_ADDR_LEN])
 {
struct ath_softc *sc = ic-ic_ifp-if_softc;
struct ath_vap *avp;
struct ieee80211vap *vap;
uint8_t mac[IEEE80211_ADDR_LEN];
-   int ic_opmode, needbeacon, error;
+   int needbeacon, error;
+   enum ieee80211_opmode ic_opmode;
 
avp = (struct ath_vap *) malloc(sizeof(struct ath_vap),
M_80211_VAP, M_WAITOK | M_ZERO);

Modified: head/sys/dev/bwi/if_bwi.c
==
--- head/sys/dev/bwi/if_bwi.c   Sat Dec 17 06:57:35 2011(r228620)
+++ head/sys/dev/bwi/if_bwi.c   Sat Dec 17 10:23:17 2011(r228621)
@@ -96,9 +96,9 @@ struct bwi_myaddr_bssid {
 } __packed;
 
 static struct ieee80211vap *bwi_vap_create(struct ieee80211com *,
-  const char [IFNAMSIZ], int, int, int,
-  const uint8_t [IEEE80211_ADDR_LEN],
-  const uint8_t [IEEE80211_ADDR_LEN]);
+   const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
+   const uint8_t [IEEE80211_ADDR_LEN],
+   const uint8_t

Re: svn commit: r228621 - in head/sys: dev/an dev/ath dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi net80211

2011-12-17 Thread Alexander Best

On Sat Dec 17 11, Bernhard Schmidt wrote:
 Author: bschmidt
 Date: Sat Dec 17 10:23:17 2011
 New Revision: 228621
 URL: http://svn.freebsd.org/changeset/base/228621
 
 Log:
   Fix some net80211 enum nits:
   - ic_vap_create() uses an ieee80211_opmode argument
   - ieee80211_rate2media() takes an ieee80211_phymode argument
   - ieee80211_plcp2rate() takes an ieee80211_phytype argument
   - cast to enum ieee80211_protmode and ieee80211_roamingmode to silence
 compiler warnings
   
   Submitted by:   arundel@

actually i merely submitted a problem report via kern/162475. ;) i didn't write 
a
single patch. so all the credit goes to bernhard. :)

 
 Modified:
   head/sys/dev/an/if_an.c
   head/sys/dev/ath/if_ath.c
   head/sys/dev/bwi/if_bwi.c
   head/sys/dev/bwn/if_bwn.c
   head/sys/dev/if_ndis/if_ndis.c
   head/sys/dev/ipw/if_ipw.c
   head/sys/dev/iwi/if_iwi.c
   head/sys/dev/iwn/if_iwn.c
   head/sys/dev/malo/if_malo.c
   head/sys/dev/mwl/if_mwl.c
   head/sys/dev/ral/rt2560.c
   head/sys/dev/ral/rt2661.c
   head/sys/dev/usb/wlan/if_rum.c
   head/sys/dev/usb/wlan/if_run.c
   head/sys/dev/usb/wlan/if_uath.c
   head/sys/dev/usb/wlan/if_upgt.c
   head/sys/dev/usb/wlan/if_ural.c
   head/sys/dev/usb/wlan/if_urtw.c
   head/sys/dev/usb/wlan/if_zyd.c
   head/sys/dev/wi/if_wi.c
   head/sys/dev/wpi/if_wpi.c
   head/sys/net80211/ieee80211.c
   head/sys/net80211/ieee80211_ht.c
   head/sys/net80211/ieee80211_ioctl.c
   head/sys/net80211/ieee80211_var.h
 
 Modified: head/sys/dev/an/if_an.c
 ==
 --- head/sys/dev/an/if_an.c   Sat Dec 17 06:57:35 2011(r228620)
 +++ head/sys/dev/an/if_an.c   Sat Dec 17 10:23:17 2011(r228621)
 @@ -797,7 +797,7 @@ an_attach(struct an_softc *sc, int flags
   ADD(IFM_AUTO, IFM_IEEE80211_ADHOC);
   for (i = 0; i  nrate; i++) {
   r = sc-an_caps.an_rates[i];
 - mword = ieee80211_rate2media(NULL, r, IEEE80211_T_DS);
 + mword = ieee80211_rate2media(NULL, r, IEEE80211_MODE_AUTO);
   if (mword == 0)
   continue;
   printf(%s%d%sMbps, (i != 0 ?   : ),
 @@ -3299,7 +3299,7 @@ an_media_status(struct ifnet *ifp, struc
   if (sc-an_config.an_opmode == AN_OPMODE_IBSS_ADHOC)
   imr-ifm_active |= IFM_IEEE80211_ADHOC;
   imr-ifm_active |= ieee80211_rate2media(NULL,
 - status.an_current_tx_rate, IEEE80211_T_DS);
 + status.an_current_tx_rate, IEEE80211_MODE_AUTO);
   imr-ifm_status = IFM_AVALID;
   if (status.an_opmode  AN_STATUS_OPMODE_ASSOCIATED)
   imr-ifm_status |= IFM_ACTIVE;
 
 Modified: head/sys/dev/ath/if_ath.c
 ==
 --- head/sys/dev/ath/if_ath.c Sat Dec 17 06:57:35 2011(r228620)
 +++ head/sys/dev/ath/if_ath.c Sat Dec 17 10:23:17 2011(r228621)
 @@ -128,9 +128,9 @@ __FBSDID($FreeBSD$);
  CTASSERT(ATH_BCBUF = 8);
  
  static struct ieee80211vap *ath_vap_create(struct ieee80211com *,
 - const char name[IFNAMSIZ], int unit, int opmode,
 - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
 - const uint8_t mac[IEEE80211_ADDR_LEN]);
 + const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
 + const uint8_t [IEEE80211_ADDR_LEN],
 + const uint8_t [IEEE80211_ADDR_LEN]);
  static void  ath_vap_delete(struct ieee80211vap *);
  static void  ath_init(void *);
  static void  ath_stop_locked(struct ifnet *);
 @@ -885,16 +885,17 @@ assign_bslot(struct ath_softc *sc)
  }
  
  static struct ieee80211vap *
 -ath_vap_create(struct ieee80211com *ic,
 - const char name[IFNAMSIZ], int unit, int opmode, int flags,
 - const uint8_t bssid[IEEE80211_ADDR_LEN],
 - const uint8_t mac0[IEEE80211_ADDR_LEN])
 +ath_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 +enum ieee80211_opmode opmode, int flags,
 +const uint8_t bssid[IEEE80211_ADDR_LEN],
 +const uint8_t mac0[IEEE80211_ADDR_LEN])
  {
   struct ath_softc *sc = ic-ic_ifp-if_softc;
   struct ath_vap *avp;
   struct ieee80211vap *vap;
   uint8_t mac[IEEE80211_ADDR_LEN];
 - int ic_opmode, needbeacon, error;
 + int needbeacon, error;
 + enum ieee80211_opmode ic_opmode;
  
   avp = (struct ath_vap *) malloc(sizeof(struct ath_vap),
   M_80211_VAP, M_WAITOK | M_ZERO);
 
 Modified: head/sys/dev/bwi/if_bwi.c
 ==
 --- head/sys/dev/bwi/if_bwi.c Sat Dec 17 06:57:35 2011(r228620)
 +++ head/sys/dev/bwi/if_bwi.c Sat Dec 17 10:23:17 2011(r228621)
 @@ -96,9 +96,9 @@ struct bwi_myaddr_bssid {
  } __packed;
  
  static struct ieee80211vap *bwi_vap_create(struct ieee80211com *,
 -const char [IFNAMSIZ], int, int, int,
 -const uint8_t [IEEE80211_ADDR_LEN],
 -

svn commit: r228621 - in head/sys: dev/an dev/ath dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi net80211

Re: svn commit: r228621 - in head/sys: dev/an dev/ath dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi net80211

2 matches

Site Navigation

Mail list logo

Footer information