r284 - in /unstable/madwifi/debian: changelog patches/00list patches/12_rxantenna-fix.dpatch patches/13_radiotap-fcs-fix.dpatch
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jul 18 01:31:29 UTC 2007
Author: kelmo-guest
Date: Wed Jul 18 01:31:28 2007
New Revision: 284
URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=284
Log:
* Add pending patches for 0.9.3.2 to debian/patches:
12_rxantenna-fix.dpatch - http://madwifi.org/ticket/1442
13_radiotap-fcs-fix - http://madwifi.org/ticket/1221
Added:
unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch
unstable/madwifi/debian/patches/13_radiotap-fcs-fix.dpatch
Modified:
unstable/madwifi/debian/changelog
unstable/madwifi/debian/patches/00list
Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=284&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Wed Jul 18 01:31:28 2007
@@ -4,8 +4,11 @@
[debian/patches/11_mips-compile-flags-fix.dpatch]
* Update debian/patches/10_compat-0.9.3-2.6.22.dpatch to also allow
successful build on 2.6.22 if patched into kernel tree.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 15 Jul 2007 18:27:27 +1000
+ * Add pending patches for 0.9.3.2 to debian/patches:
+ 12_rxantenna-fix.dpatch - http://madwifi.org/ticket/1442
+ 13_radiotap-fcs-fix - http://madwifi.org/ticket/1221
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 18 Jul 2007 11:30:59 +1000
madwifi (1:0.9.3-3) unstable; urgency=low
Modified: unstable/madwifi/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/00list?rev=284&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/00list (original)
+++ unstable/madwifi/debian/patches/00list Wed Jul 18 01:31:28 2007
@@ -3,3 +3,5 @@
03_secfix-0.9.3-beacon_interval_range
10_compat-0.9.3-2.6.22
11_mips-compile-flags-fix
+12_rxantenna-fix
+13_radiotap-fcs-fix
Added: unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch?rev=284&op=file
==============================================================================
--- unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch (added)
+++ unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch Wed Jul 18 01:31:28 2007
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## madwifi-rxantenna.patch by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://madwifi.org/ticket/1442
+
+ at DPATCH@
+diff -Nrup madwifi-0.9.3/ath/if_ath.c madwifi-0.9.3-rxant/ath/if_ath.c
+--- madwifi-0.9.3/ath/if_ath.c 2007-03-03 16:20:46.000000000 +1000
++++ madwifi-0.9.3-rxant/ath/if_ath.c 2007-07-18 11:16:00.000000000 +1000
+@@ -1846,6 +1846,7 @@ ath_init(struct net_device *dev)
+ struct ath_hal *ah = sc->sc_ah;
+ HAL_STATUS status;
+ int error = 0;
++ u_int antenna;
+
+ ATH_LOCK(sc);
+
+@@ -1907,6 +1908,19 @@ ath_init(struct net_device *dev)
+ ath_update_txpow(sc);
+
+ /*
++ * If the rxantenna was changed by the 'reset',
++ * set if back to the saved value.
++ */
++ antenna = ath_hal_getdefantenna(ah);
++ if (sc->sc_defant != antenna) {
++ printk(KERN_INFO "%s: resetting rxantenna to %d\n",
++ dev->name,
++ sc->sc_defant);
++
++ ath_setdefantenna(sc, sc->sc_defant);
++ }
++
++ /*
+ * Setup the hardware after reset: the key cache
+ * is filled as needed and the receive engine is
+ * set going. Frame transmit is handled entirely
Added: unstable/madwifi/debian/patches/13_radiotap-fcs-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/13_radiotap-fcs-fix.dpatch?rev=284&op=file
==============================================================================
--- unstable/madwifi/debian/patches/13_radiotap-fcs-fix.dpatch (added)
+++ unstable/madwifi/debian/patches/13_radiotap-fcs-fix.dpatch Wed Jul 18 01:31:28 2007
@@ -1,0 +1,104 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## patch-03-radiotap-fcs-fix.diff by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: radiotap update
+
+ at DPATCH@
+
+Standardise Radiotap FCS Handling
+
+http://madwifi.org/ticket/1221
+
+This patch was rebased for madwifi-0.9.3.1
+
+Signed-Off by: Luis Rodriguez <mcgrof at winlab.rutgers.edu>
+
+diff -Naur madwifi-0.9.3.1/net80211/ieee80211_monitor.c madwifi-0.9.3.1-radiotap/net80211/ieee80211_monitor.c
+--- madwifi-0.9.3.1/net80211/ieee80211_monitor.c 2007-02-14 18:45:48.000000000 -0500
++++ madwifi-0.9.3.1-radiotap/net80211/ieee80211_monitor.c 2007-07-13 14:44:08.000000000 -0400
+@@ -242,11 +242,6 @@
+ p = start + roundup(p - start, 2) + 4;
+ break;
+
+- case IEEE80211_RADIOTAP_FCS:
+- /* 32-bit */
+- p = start + roundup(p - start, 4) + 4;
+- break;
+-
+ case IEEE80211_RADIOTAP_TSFT:
+ /* 64-bit */
+ p = start + roundup(p - start, 8) + 8;
+@@ -492,6 +487,8 @@
+ th->wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
+ if (ds->ds_rxstat.rs_status & HAL_RXERR_CRC)
+ th->wr_flags |= IEEE80211_RADIOTAP_F_BADFCS;
++ if (skb->len >= IEEE80211_CRC_LEN)
++ th->wr_flags |= IEEE80211_RADIOTAP_F_FCS;
+
+ th->wr_rate = sc->sc_hwmap[ds->ds_rxstat.rs_rate].ieeerate;
+ th->wr_chan_freq = cpu_to_le16(ic->ic_curchan->ic_freq);
+@@ -527,10 +524,6 @@
+ th->wr_dbm_antsignal = th->wr_dbm_antnoise + rssi;
+ th->wr_antenna = ds->ds_rxstat.rs_antenna;
+ th->wr_antsignal = rssi;
+- if (skb->len >= IEEE80211_CRC_LEN)
+- th->wr_fcs = cpu_to_le32p((u32 *)&skb1->data[skb1->len - IEEE80211_CRC_LEN]);
+- else
+- th->wr_fcs = 0;
+
+ th->wr_tsft = cpu_to_le64(mactime);
+ }
+@@ -550,8 +543,9 @@
+ break;
+ }
+ if (skb1) {
+- if (!tx && skb->len >= IEEE80211_CRC_LEN) {
+- /* Remove FCS from end of rx frames*/
++ if (!tx && (vap->iv_dev->type != ARPHRD_IEEE80211_RADIOTAP) && (skb1->len >= IEEE80211_CRC_LEN)) {
++ /* Remove FCS from end of rx frames when
++ * delivering to non-Radiotap VAPs */
+ skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);
+ }
+ skb1->dev = dev; /* NB: deliver to wlanX */
+diff -Naur madwifi-0.9.3.1/net80211/ieee80211_monitor.h madwifi-0.9.3.1-radiotap/net80211/ieee80211_monitor.h
+--- madwifi-0.9.3.1/net80211/ieee80211_monitor.h 2007-01-29 23:57:52.000000000 -0500
++++ madwifi-0.9.3.1-radiotap/net80211/ieee80211_monitor.h 2007-07-13 14:46:53.000000000 -0400
+@@ -116,7 +116,6 @@
+ (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) | \
+ (1 << IEEE80211_RADIOTAP_ANTENNA) | \
+ (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \
+- (1 << IEEE80211_RADIOTAP_FCS) | \
+ 0)
+
+ struct ath_rx_radiotap_header {
+@@ -130,8 +129,6 @@
+ int8_t wr_dbm_antnoise;
+ u_int8_t wr_antenna;
+ u_int8_t wr_antsignal;
+- u_int8_t wr_pad[2]; /* Ensure fcs is on 32 bit boundary */
+- __le32 wr_fcs;
+ }__attribute__((__packed__));
+
+ #define ATH_TX_RADIOTAP_PRESENT ( \
+diff -Naur madwifi-0.9.3.1/net80211/ieee80211_radiotap.h madwifi-0.9.3.1-radiotap/net80211/ieee80211_radiotap.h
+--- madwifi-0.9.3.1/net80211/ieee80211_radiotap.h 2007-01-29 22:51:52.000000000 -0500
++++ madwifi-0.9.3.1-radiotap/net80211/ieee80211_radiotap.h 2007-07-13 14:44:08.000000000 -0400
+@@ -153,9 +153,6 @@
+ * Unitless indication of the Rx/Tx antenna for this packet.
+ * The first antenna is antenna 0.
+ *
+- * IEEE80211_RADIOTAP_FCS u_int32_t data
+- *
+- * FCS from frame in network byte order.
+ */
+ enum ieee80211_radiotap_type {
+ IEEE80211_RADIOTAP_TSFT = 0,
+@@ -172,7 +169,6 @@
+ IEEE80211_RADIOTAP_ANTENNA = 11,
+ IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
+ IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
+- IEEE80211_RADIOTAP_FCS = 14,
+ IEEE80211_RADIOTAP_EXT = 31,
+ };
+
More information about the Pkg-madwifi-maintainers
mailing list