Changeset 3772

Timestamp:

07/15/08 14:58:49 (3 months ago)

Author:

proski

Message:

Merge -r3751:3771 from trunk

Files:

• madwifi/branches/madwifi-hal-0.10.5.6/INSTALL (modified) (3 diffs)
• madwifi/branches/madwifi-hal-0.10.5.6/Makefile (modified) (3 diffs)
• madwifi/branches/madwifi-hal-0.10.5.6/ath/if_ath.c (modified) (31 diffs)
• madwifi/branches/madwifi-hal-0.10.5.6/include/compat.h (modified) (1 diff)
• madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_crypto.h (modified) (1 diff)
• madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c (modified) (3 diffs)

madwifi/branches/madwifi-hal-0.10.5.6/INSTALL

@@ -10 +10 @@
-------------
-
-Some
-headers, makefiles and configuration data - it
-hould s
-
-(14 or later, 17 preferred) - option
-NET_RADIO in kernel .config fi
+Most
+a kernel development package - it should
+
+
+- option CONFIG_NET_RADIO or
+WIRELESS_EXT in kernel .config file, whichever is availab
-
-- Sysctl support - option CONFIG_SYSCTL in kernel .config file.
@@ -23 +23 @@
-  back to a private implementation).
-
-
+the 
-  make sure that the first two version numbers or the compiler are the
-  same (e.g. it's OK to use gcc 3.4.6 to compile MadWifi if the kernel
@@ -35 +35 @@
-work.
-
-
-
+
+
+
-
-Building the driver

madwifi/branches/madwifi-hal-0.10.5.6/Makefile

@@ -44 +44 @@
-TOP = $(obj)
-
-ifneq (svnversion.h,$(MAKECMDGOALS))
-include $(TOP)/Makefile.inc
-endif
-
-obj-y := ath/ ath_hal/ ath_rate/ net80211/
@@ -58 +56 @@
-
-.PHONY: modules
-
+$(TOP)/
-ifdef LINUX24
-        for i in $(obj-y); do \
@@ -67 +65 @@
-endif
-
-
-
-
+
+
+
+
+
-                ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
-                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \

madwifi/branches/madwifi-hal-0.10.5.6/ath/if_ath.c

@@ -103 +103 @@
-
-#include "ah_os.h"
+
+#ifndef MAX
+# define MAX(a, b)      (((a) > (b))? (a) : (b))
+#endif
+#ifndef MIN
+# define MIN(a, b)      (((a) < (b))? (a) : (b))
+#endif
-
-/* unaligned little endian access */
@@ -3695 +3702 @@
-        HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN])
-{
-#define IEEE80211_KEY_XR        (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV)
-        static const u_int8_t zerobssid[IEEE80211_ADDR_LEN];
-        struct ath_hal *ah = sc->sc_ah;
@@ -3701 +3707 @@
-        KASSERT(k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP,
-                ("got a non-TKIP key, cipher %u", k->wk_cipher->ic_cipher));
-XR) == IEEE80211_KEY_XR
+TXRX) == IEEE80211_KEY_TXRX
-                if (sc->sc_splitmic) {
-                        /*
@@ -3732 +3738 @@
-                                        mac, AH_FALSE);
-                }
-
-
-
-
-
+
+
+
-                memcpy(hk->kv_mic, k->wk_flags & IEEE80211_KEY_XMIT ?
-                        k->wk_txmic : k->wk_rxmic, sizeof(hk->kv_mic));
@@ -3744 +3748 @@
-        }
-        return 0;
-#undef IEEE80211_KEY_XR
-}
-
@@ -4152 +4155 @@
-ath_calcrxfilter(struct ath_softc *sc)
-{
-#define RX_FILTER_PRESERVE      (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR)
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct net_device *dev = ic->ic_dev;
@@ -4158 +4160 @@
-        u_int32_t rfilt;
-
-
+
+
+
-                 HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST |
-                 HAL_RX_FILTER_MCAST;
@@ -4175 +4179 @@
-                rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
-        return rfilt;
-#undef RX_FILTER_PRESERVE
-}
-
@@ -4242 +4245 @@
-ath_slottime2timeout(struct ath_softc *sc, int slottime)
-{
-
-
+
+
+
-         *
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static inline int 
@@ -4373 +4374 @@
-ath_beacon_dturbo_config(struct ieee80211vap *vap, u_int32_t intval)
-{
-#define IS_CAPABLE(vap) \
-        (vap->iv_bss && (vap->iv_bss->ni_ath_flags & (IEEE80211_ATHC_TURBOP)) == \
-                (IEEE80211_ATHC_TURBOP))
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ath_softc *sc = ic->ic_dev->priv;
-
-
-
+
+
+
+
-                /* Dynamic Turbo is supported on this channel. */
-                sc->sc_dturbo = 1;
@@ -4414 +4414 @@
-                ic->ic_ath_cap &= ~IEEE80211_ATHC_BOOST;
-        }
-#undef IS_CAPABLE
-}
-
@@ -4644 +4643 @@
-ath_beaconq_config(struct ath_softc *sc)
-{
-#define ATH_EXPONENT_TO_VALUE(v)        ((1<<v)-1)
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ath_hal *ah = sc->sc_ah;
@@ -4665 +4663 @@
-                qi.tqi_aifs = wmep->wmep_aifsn;
-                qi.tqi_cwmin = 0;
-ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmin
+((1 << wmep->wmep_logcwmin) - 1
-        }
-
@@ -4681 +4679 @@
-                return 1;
-        }
-#undef ATH_EXPONENT_TO_VALUE
-}
-
@@ -7184 +7181 @@
-ath_txq_update(struct ath_softc *sc, struct ath_txq *txq, int ac)
-{
-#define ATH_EXPONENT_TO_VALUE(v)        ((1<<v)-1)
-#define ATH_TXOP_TO_US(v)               (v<<5)
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct wmeParams *wmep = &ic->ic_wme.wme_chanParams.cap_wmeParams[ac];
@@ -7193 +7188 @@
-        ath_hal_gettxqueueprops(ah, txq->axq_qnum, &qi);
-        qi.tqi_aifs = wmep->wmep_aifsn;
-ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmin)
-ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmax)
-ATH_TXOP_TO_US(wmep->wmep_txopLimit);
+(1 << wmep->wmep_logcwmin) - 1
+(1 << wmep->wmep_logcwmax) - 1
+wmep->wmep_txopLimit / 32; /* 32 us units. */
-
-        if (!ath_hal_settxqueueprops(ah, txq->axq_qnum, &qi)) {
@@ -7206 +7201 @@
-                return 1;
-        }
-#undef ATH_TXOP_TO_US
-#undef ATH_EXPONENT_TO_VALUE
-}
-
@@ -7408 +7401 @@
-                struct ath_buf *bf, struct sk_buff *skb, int nextfraglen)
-{
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-        struct ath_softc *sc = dev->priv;
-        struct ieee80211com *ic = ni->ni_ic;
@@ -7998 +7990 @@
-        ath_tx_txqaddbuf(sc, PASS_NODE(ni), txq, bf, pktlen);
-        return 0;
-#undef MIN
-}
-
@@ -9329 +9320 @@
-ath_setup_comp(struct ieee80211_node *ni, int enable)
-{
-#define IEEE80211_KEY_XR        (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV)
-        struct ieee80211vap *vap = ni->ni_vap;
-        struct ath_softc *sc = vap->iv_ic->ic_dev->priv;
@@ -9351 +9341 @@
-                    (ni->ni_rsn.rsn_ucastcipher == IEEE80211_CIPHER_TKIP) &&
-                    sc->sc_splitmic) {
-XR
-XR
+TXRX
+TXRX
-                                keyix = ni->ni_ucastkey.wk_keyix + 32;
-                        else
@@ -9369 +9359 @@
-
-        return;
-#undef IEEE80211_KEY_XR
-}
-#endif
@@ -10103 +10092 @@
-        u_int32_t txoplimit;
-
-#define US_PER_4MS 4000
-#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-
-        *flushq = AH_FALSE;
-
@@ -10129 +10115 @@
-                ic->ic_wme.wme_chanParams.cap_wmeParams[skb->priority].wmep_txopLimit);
-
-if the 4 msec limit is set on the channel, take it into account
+Handle 4 ms channel limit.
-        if (sc->sc_curchan.privFlags & CHANNEL_4MS_LIMIT)
-US_PER_4MS
+4000
-
-        if (txoplimit != 0 && athff_approx_txtime(sc, an, skb) > txoplimit) {
@@ -10142 +10128 @@
-
-        return AH_TRUE;
-
-#undef US_PER_4MS
-#undef MIN
-}
-#endif
@@ -10454 +10437 @@
-ath_estimate_max_distance(struct ath_softc *sc)
-{
-d, ask HAL if not overridden
+; ask HAL if not overridden.
-        int slottime = sc->sc_slottimeconf;
-        if (slottime <= 0)
-                slottime = ath_hal_getslottime(sc->sc_ah);
-
-
+
+
+
-        return (slottime - ath_ccatime(sc)) * 150;
-}
@@ -10466 +10450 @@
-ath_distance2slottime(struct ath_softc *sc, int distance)
-{
-
-        /* Allowance for air propagation (roundtrip time) should be at least 
-         * 5us per the standards.
-         * 
-         * So let's set a minimum distance to accomodate this: 
-
-
-
-
-
+
+
-        int rtdist = distance * 2;
-
-
-
-
-
+
+
+
+
-        return ath_ccatime(sc) + aAirPropagation;
-}
@@ -10488 +10467 @@
-ath_distance2timeout(struct ath_softc *sc, int distance)
-{
-
-The 18us covers rxtx turnaround, MIB processing, etc.
-but the athctrl used to return 2slot+3 so the extra 15us of 
-timeout is probably just being very careful or taking something into
-account that I can't 
+ The 18us covers
+RX/TX turnaround, MIB processing, etc., but the athctrl used to
+return (2 * slot) + 3, so the extra 15us of timeout is probably just
+being very careful or taking something into account that I can't
+
-         *
- timeout)
-
+
+ timeout). *
-        return ath_slottime2timeout(sc, ath_distance2slottime(sc, distance));
-}
@@ -10511 +10490 @@
-        ctl->maxlen = sizeof(val);
-
-
-
-
-
+
+
+
-        if (ctl->extra2 == (void *)ATH_RP) {
-                ctl->data = &tab_3_val;
@@ -12048 +12026 @@
-        char buf[MAX_REGISTER_NAME_LEN];
-#endif
-        #define UNFILTERED AH_FALSE
-        #define FILTERED   AH_TRUE
-
-        if ((ar_device(sc->devid) != 5212) && (ar_device(sc->devid) != 5213)) 
-FILTERED
+AH_TRUE
-        /* Addresses with side effects are never dumped out by bulk debug 
-         * dump routines. */
-FILTERED
-FILTERED
+AH_TRUE
+AH_TRUE
-        /* PCI timing registers are not interesting */
-FILTERED
+AH_TRUE
-        /* reading 0x9200-0x092c causes crashes in turbo A mode? */
-FILTERED
+AH_TRUE
-
-#ifndef ATH_REVERSE_ENGINEERING_WITH_NO_FEAR
@@ -12069 +12044 @@
-        return (AH_TRUE == ath_hal_lookup_register_name(sc->sc_ah, buf, 
-                                MAX_REGISTER_NAME_LEN, address)) ?
-UNFILTERED : FILTERED
+AH_FALSE : AH_TRUE
-#else /* #ifndef ATH_REVERSE_ENGINEERING_WITH_NO_FEAR */
-
-UNFILTERED
+AH_FALSE
-#endif /* #ifndef ATH_REVERSE_ENGINEERING_WITH_NO_FEAR */
-        #undef UNFILTERED
-        #undef FILTERED
-}
-#endif /* #ifdef ATH_REVERSE_ENGINEERING */

madwifi/branches/madwifi-hal-0.10.5.6/include/compat.h

@@ -124 +124 @@
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-typedef int gfp_t;
-
-
-
+
-static inline void *kzalloc(size_t size, gfp_t flags)
-{

madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_crypto.h

@@ -81 +81 @@
-#define IEEE80211_KEY_SWCRYPT   0x10    /* host-based encrypt/decrypt */
-#define IEEE80211_KEY_SWMIC     0x20    /* host-based enmic/demic */
+#define IEEE80211_KEY_TXRX      (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV)
-        ieee80211_keyix_t wk_keyix;     /* key index */
-        u_int8_t wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];

madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c

@@ -1777 +1777 @@
-};
-
-6
- 
- 
- 
+7) && !defined(IW_REQUEST_FLAG_COMPAT
+        
+        
+        
-        iwe_stream_add_value(b, c, d, e, f)
+#define iwe_stream_lcp_len(a)                   IW_EV_LCP_LEN
-#endif
-static int
@@ -1889 +1890 @@
-        last_ev = current_ev;
-        iwe.cmd = SIOCGIWRATE;
-IW_EV_LCP_LEN
+iwe_stream_lcp_len(req->info)
-        /* NB: not sorted, does it matter? */
-        for (j = 0; j < se->se_rates[1]; j++) {
@@ -1910 +1911 @@
-        }
-        /* remove fixed header if no rates were added */
-IW_EV_LCP_LEN
+iwe_stream_lcp_len(req->info)
-                current_ev = current_val;
-        } else {