Skip to contentSkip to conversation

acxsm: merge from acx 0.3.32

PATCH In review Denis Vlasenko 2 participants 3 messages Feb 3, 2006 – Feb 8, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 acxsm: merge from acx 0.3.32

Standalone acx driver had several fixes since
acxsm fork, this patch merges them:
- initial support for new TNETW1450 USB chip
- support for firmware 2.3.1.31

Also we had one report that acxsm is actually working. That's quite unexpected.

--
vda

drivers/net/wireless/tiacx/Changelog +6 -0
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/Changelog wireless-2.6.git.acx/drivers/net/wireless/tiacx/Changelog
@@ -70,6 +70,12 @@ TODO: from Efthym <[email protected]>:
 13:13:32 wlan0: tx error 0x20, buf 05!
 13:13:32 wlan0: tx error 0x20, buf 06!
 
+[20060203] 0.4.3
+* merge from acx 0.3.32
+
+[20060123] 0.4.2
+* conv.c removed
+
 [20060117] 0.4.1
 * Lots of code commented out
 
drivers/net/wireless/tiacx/acx_config.h +2 -2
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/acx_config.h wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_config.h
@@ -1,10 +1,10 @@
-#define ACX_RELEASE "v0.4.2"
+#define ACX_RELEASE "v0.4.3"
 
 /* set to 0 if you don't want any debugging code to be compiled in */
 /* set to 1 if you want some debugging */
 /* set to 2 if you want extensive debug log */
 #define ACX_DEBUG 2
-#define ACX_DEFAULT_MSG 0
+#define ACX_DEFAULT_MSG (L_ASSOC|L_INIT)
 
 /* assume 32bit I/O width
  * (16bit is also compatible with Compact Flash) */
drivers/net/wireless/tiacx/acx_func.h +1 -8
diff -urpN wireless-2.6.git/drivers/net/wireless/tiacx/acx_func.h wireless-2.6.git.acx/drivers/net/wireless/tiacx/acx_func.h
@@ -565,14 +565,7 @@ acx_l_tx_data(acx_device_t *adev, tx_t *
 static inline wlan_hdr_t*
 acx_get_wlan_hdr(acx_device_t *adev, const rxbuffer_t *rxbuf)
 {
-	if (!(adev->rx_config_1 & RX_CFG1_INCLUDE_PHY_HDR))
-		return (wlan_hdr_t*)&rxbuf->hdr_a3;
-
-	/* take into account phy header in front of packet */
-	if (IS_ACX111(adev))
-		return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + 8);
-
-	return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + 4);
+	return (wlan_hdr_t*)((u8*)&rxbuf->hdr_a3 + adev->phy_header_len);
 }
 
 void acxpci_l_power_led(acx_device_t *adev, int enable);
drivers/net/wireless/tiacx/acx_struct.h +55 -52

216 lines not on this page · raw message

drivers/net/wireless/tiacx/common.c +193 -69

517 lines not on this page · raw message

drivers/net/wireless/tiacx/ioctl.c +22 -24

99 lines not on this page · raw message

drivers/net/wireless/tiacx/pci.c +49 -49

220 lines not on this page · raw message

drivers/net/wireless/tiacx/usb.c +331 -118

581 lines not on this page · raw message

#1 lore raw

Hello John,

Quoted 9 lines · Denis Vlasenko

Standalone acx driver had several fixes since
acxsm fork, this patch merges them:
- initial support for new TNETW1450 USB chip
- support for firmware 2.3.1.31

Also we had one report that acxsm is actually working. That's quite unexpected.

What is the status of this patch? Accepted? Rejected? Other (please specify): ____________________

--
vda

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642

#2 lore raw
Quoted 6 lines · Denis Vlasenko
Quoted 5 lines · Denis Vlasenko

Standalone acx driver had several fixes since
acxsm fork, this patch merges them:
- initial support for new TNETW1450 USB chip
- support for firmware 2.3.1.31

Quoted 7 lines
Quoted 4 lines

Also we had one report that acxsm is actually working. That's quite unexpected.

What is the status of this patch? Accepted? Rejected? Other (please specify): ____________________

I intened to merge it. I had a busy week last week, with some personal obligations. I apologize for my slow speed. I'll try to do better! :-)

John

Signature · 9 lines
John W. Linville
[email protected]


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642