SOURCES: madwifi-hal-ieee80211-skb-update.patch (NEW), madwifi-hal-makefile...

mguevara mguevara at pld-linux.org
Fri Sep 5 13:42:10 CEST 2008


Author: mguevara                     Date: Fri Sep  5 11:42:10 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- set of madwifi patches for the madwifi-hal line of the driver btw. the
  patches are the same as the madwifi-ng-* set

---- Files affected:
SOURCES:
   madwifi-hal-ieee80211-skb-update.patch (NONE -> 1.1)  (NEW), madwifi-hal-makefile-werror.patch (NONE -> 1.1)  (NEW), madwifi-hal-r3745.patch (NONE -> 1.1)  (NEW), madwifi-hal-ticket-617.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/madwifi-hal-ieee80211-skb-update.patch
diff -u /dev/null SOURCES/madwifi-hal-ieee80211-skb-update.patch:1.1
--- /dev/null	Fri Sep  5 13:42:11 2008
+++ SOURCES/madwifi-hal-ieee80211-skb-update.patch	Fri Sep  5 13:42:03 2008
@@ -0,0 +1,12 @@
+--- a/net80211/ieee80211_linux.h	2008-05-09 01:15:01 +0400
++++ b/net80211/ieee80211_linux.h	2008-05-11 02:26:35 +0400
+@@ -315,6 +315,9 @@ typedef spinlock_t acl_lock_t;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ #define __skb_append(a,b,c)	__skb_append(a, b)
+ #endif
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
++#define __skb_append(a,b,c)	__skb_queue_after(c,a,b)
++#endif
+ 
+ /*
+  * Per-node power-save queue definitions.  Beware of control

================================================================
Index: SOURCES/madwifi-hal-makefile-werror.patch
diff -u /dev/null SOURCES/madwifi-hal-makefile-werror.patch:1.1
--- /dev/null	Fri Sep  5 13:42:11 2008
+++ SOURCES/madwifi-hal-makefile-werror.patch	Fri Sep  5 13:42:04 2008
@@ -0,0 +1,11 @@
+--- madwifi-ng-r3556-20080421/Makefile.inc	2008-04-18 02:08:35.000000000 +0000
++++ madwifi-ng-r3556-20080421/Makefile.inc	2008-07-22 18:41:38.000000000 +0000
+@@ -148,7 +148,7 @@
+ TOOLS=  $(TOP)/tools 
+ 
+ WARNINGS = -Werror -Wall
+-COPTS+= $(WARNINGS)
++#COPTS+= $(WARNINGS)
+ INCS=	-include $(TOP)/include/compat.h -I$(TOP)/include
+ 
+ # TARGET defines the target platform architecture. It must match one of

================================================================
Index: SOURCES/madwifi-hal-r3745.patch
diff -u /dev/null SOURCES/madwifi-hal-r3745.patch:1.1
--- /dev/null	Fri Sep  5 13:42:12 2008
+++ SOURCES/madwifi-hal-r3745.patch	Fri Sep  5 13:42:04 2008
@@ -0,0 +1,31 @@
+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_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
+ {
+ 	struct ath_softc *sc = dev->priv;
++	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 @@
+ 	struct ieee80211_frame *wh;
+ 
+ 	wh = (struct ieee80211_frame *)skb->data;
+-	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 @@
+ 	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) ) {
+ 		flags |= HAL_TXDESC_NOACK;	/* no ack on broad/multicast */
+ 		sc->sc_stats.ast_tx_noack++;
+ 		try0 = 1;

================================================================
Index: SOURCES/madwifi-hal-ticket-617.patch
diff -u /dev/null SOURCES/madwifi-hal-ticket-617.patch:1.1
--- /dev/null	Fri Sep  5 13:42:12 2008
+++ SOURCES/madwifi-hal-ticket-617.patch	Fri Sep  5 13:42:05 2008
@@ -0,0 +1,11 @@
+--- madwifi-ng-r1757-20061020/net80211/ieee80211.h~	2006-10-18 13:41:05.000000000 +0200
++++ madwifi-ng-r1757-20061020/net80211/ieee80211.h	2006-10-21 02:14:24.000000000 +0200
+@@ -174,7 +174,7 @@ struct ieee80211_ctlframe_addr2 {
+ #define	IEEE80211_SEQ_SEQ_MASK			0xfff0
+ #define	IEEE80211_SEQ_SEQ_SHIFT			4
+ 
+-#define	IEEE80211_SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
++#define	IEEE80211_SEQ_LEQ(a,b)	((int)((a)-(b)) == 0)
+ 
+ #define	IEEE80211_NWID_LEN			32
+ 
================================================================


More information about the pld-cvs-commit mailing list