r285 - in /unstable/madwifi/debian: changelog patches/12_rxantenna-fix.dpatch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jul 24 14:30:52 2007
New Revision: 285

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=285
Log:
* Refresh 12_rxantenna-fix.dpatch with what was actually committed to
  0.9.3 release branch.

Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=285&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Tue Jul 24 14:30:52 2007
@@ -7,8 +7,10 @@
   * 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
+  * Refresh 12_rxantenna-fix.dpatch with what was actually committed to
+    0.9.3 release branch.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 25 Jul 2007 00:29:53 +1000
 
 madwifi (1:0.9.3-3) unstable; urgency=low
 

Modified: 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=285&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch (original)
+++ unstable/madwifi/debian/patches/12_rxantenna-fix.dpatch Tue Jul 24 14:30:52 2007
@@ -5,34 +5,16 @@
 ## DP: http://madwifi.org/ticket/1442
 
 @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)
+diff -Nrup madwifi-0.9.3.orig/ath/if_ath.c madwifi-0.9.3/ath/if_ath.c
+--- madwifi-0.9.3.orig/ath/if_ath.c	2007-03-03 16:20:46.000000000 +1000
++++ madwifi-0.9.3/ath/if_ath.c	2007-07-25 00:28:26.000000000 +1000
+@@ -1906,6 +1906,9 @@ ath_init(struct net_device *dev)
+ 	 */
  	ath_update_txpow(sc);
  
++	/* Set the default RX antenna; it may get lost on reset. */
++	ath_setdefantenna(sc, sc->sc_defant);
++
  	/*
-+	 * 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