packages: madwifi-ng/madwifi-ng-r3745.patch - updated for 2.6.30.x

[shadzik]

Author: shadzik                      Date: Tue Jul 14 17:23:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 2.6.30.x

---- Files affected:
packages/madwifi-ng:
   madwifi-ng-r3745.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/madwifi-ng/madwifi-ng-r3745.patch
diff -u packages/madwifi-ng/madwifi-ng-r3745.patch:1.3 packages/madwifi-ng/madwifi-ng-r3745.patch:1.4
--- packages/madwifi-ng/madwifi-ng-r3745.patch:1.3	Wed Feb 25 00:23:57 2009
+++ packages/madwifi-ng/madwifi-ng-r3745.patch	Tue Jul 14 19:23:31 2009
@@ -1,31 +1,30 @@
-diff -Naur madwifi/ath/if_ath.c madwifi_rawtx/ath/if_ath.c
---- madwifi/ath/if_ath.c	2008-06-24 17:20:58.000000000 -0400
-+++ madwifi_rawtx/ath/if_ath.c	2008-06-24 17:20:12.000000000 -0400
-@@ -2950,6 +2950,7 @@
+--- ath/if_ath.c.orig	2009-07-14 19:16:35.000000000 +0200
++++ ath/if_ath.c	2009-07-14 19:19:30.000000000 +0200
+@@ -3152,6 +3152,7 @@
  ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
  {
- 	struct ath_softc *sc = dev->priv;
+ 	struct ath_softc *sc = netdev_priv(dev);
 +	struct ieee80211com *ic = &sc->sc_ic;
  	struct ath_hal *ah = sc->sc_ah;
  	struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); 
  	const HAL_RATE_TABLE *rt;
-@@ -2962,7 +2963,8 @@
+@@ -3164,7 +3165,8 @@
  	struct ieee80211_frame *wh;
  
  	wh = (struct ieee80211_frame *)skb->data;
 -	try0 = ph->try[0];
-+//	try0 = ph->try[0];
++	//try0 = ph->try[0];
 +	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0];
  	rt = sc->sc_currates;
  	txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
  	power = ph->power > 60 ? 60 : ph->power;
-@@ -2986,7 +2988,8 @@
+@@ -3188,7 +3190,8 @@
  	rt = sc->sc_currates;
  	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
 -	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-+	if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == 
-+IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
++	if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode ==
++		IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
  		flags |= HAL_TXDESC_NOACK;	/* no ack on broad/multicast */
  		sc->sc_stats.ast_tx_noack++;
  		try0 = 1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/madwifi-ng/madwifi-ng-r3745.patch?r1=1.3&r2=1.4&f=u