[email protected]
[Top] [All Lists]

PERFORCE change 114931 for review

Subject: PERFORCE change 114931 for review
From: Sam Leffler
Date: Fri, 23 Feb 2007 23:44:43 GMT
http://perforce.freebsd.org/chv.cgi?CH=114931

Change 114931 by [email protected]_ebb on 2007/02/23 23:43:44

        expand ic_flags to 32-bits; it'll be required to handle
        11n (there is a hole in the channel struct that'll be
        used eventually to support dfs)

Affected files ...

.. //depot/projects/wifi/sys/net80211/_ieee80211.h#17 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/_ieee80211.h#17 (text+ko) ====

@@ -105,12 +105,13 @@
  * Channels are specified by frequency and attributes.
  */
 struct ieee80211_channel {
+       u_int32_t       ic_flags;       /* see below */
        u_int16_t       ic_freq;        /* setting in Mhz */
-       u_int16_t       ic_flags;       /* see below */
        u_int8_t        ic_ieee;        /* IEEE channel number */
        int8_t          ic_maxregpower; /* maximum regulatory tx power in dBm */
        int8_t          ic_maxpower;    /* maximum tx power in .5 dBm */
        int8_t          ic_minpower;    /* minimum tx power in .5 dBm */
+       /* NB: hole, to be used for dfs */
 };
 
 #define        IEEE80211_CHAN_MAX      255
@@ -121,18 +122,18 @@
 
 /* bits 0-3 are for private use by drivers */
 /* channel attributes */
-#define        IEEE80211_CHAN_TURBO    0x0010  /* Turbo channel */
-#define        IEEE80211_CHAN_CCK      0x0020  /* CCK channel */
-#define        IEEE80211_CHAN_OFDM     0x0040  /* OFDM channel */
-#define        IEEE80211_CHAN_2GHZ     0x0080  /* 2 GHz spectrum channel. */
-#define        IEEE80211_CHAN_5GHZ     0x0100  /* 5 GHz spectrum channel */
-#define        IEEE80211_CHAN_PASSIVE  0x0200  /* Only passive scan allowed */
-#define        IEEE80211_CHAN_DYN      0x0400  /* Dynamic CCK-OFDM channel */
-#define        IEEE80211_CHAN_GFSK     0x0800  /* GFSK channel (FHSS PHY) */
-#define        IEEE80211_CHAN_GSM      0x1000  /* 900 MHz spectrum channel */
-#define        IEEE80211_CHAN_STURBO   0x2000  /* 11a static turbo channel 
only */
-#define        IEEE80211_CHAN_HALF     0x4000  /* Half rate channel */
-#define        IEEE80211_CHAN_QUARTER  0x8000  /* Quarter rate channel */
+#define        IEEE80211_CHAN_TURBO    0x00010 /* Turbo channel */
+#define        IEEE80211_CHAN_CCK      0x00020 /* CCK channel */
+#define        IEEE80211_CHAN_OFDM     0x00040 /* OFDM channel */
+#define        IEEE80211_CHAN_2GHZ     0x00080 /* 2 GHz spectrum channel. */
+#define        IEEE80211_CHAN_5GHZ     0x00100 /* 5 GHz spectrum channel */
+#define        IEEE80211_CHAN_PASSIVE  0x00200 /* Only passive scan allowed */
+#define        IEEE80211_CHAN_DYN      0x00400 /* Dynamic CCK-OFDM channel */
+#define        IEEE80211_CHAN_GFSK     0x00800 /* GFSK channel (FHSS PHY) */
+#define        IEEE80211_CHAN_GSM      0x01000 /* 900 MHz spectrum channel */
+#define        IEEE80211_CHAN_STURBO   0x02000 /* 11a static turbo channel 
only */
+#define        IEEE80211_CHAN_HALF     0x04000 /* Half rate channel */
+#define        IEEE80211_CHAN_QUARTER  0x08000 /* Quarter rate channel */
 
 /*
  * Useful combinations of channel characteristics.
@@ -183,6 +184,8 @@
        (((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0)
 #define        IEEE80211_IS_CHAN_5GHZ(_c) \
        (((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0)
+#define        IEEE80211_IS_CHAN_PASSIVE(_c) \
+       (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0)
 #define        IEEE80211_IS_CHAN_OFDM(_c) \
        (((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0)
 #define        IEEE80211_IS_CHAN_CCK(_c) \
@@ -204,8 +207,6 @@
        (((_c)->ic_flags & (IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HALF)) == 0)
 #define        IEEE80211_IS_CHAN_GSM(_c) \
        (((_c)->ic_flags & IEEE80211_CHAN_GSM) != 0)
-#define        IEEE80211_IS_CHAN_PASSIVE(_c) \
-       (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0)
 
 /* ni_chan encoding for FH phy */
 #define        IEEE80211_FH_CHANMOD    80
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/p4-projects
To unsubscribe, send any mail to "[email protected]"

<Prev in Thread] Current Thread [Next in Thread>
  • PERFORCE change 114931 for review, Sam Leffler <=