Nuked the skb_reserve(2) on the rx path, as it caused alignment problems

and didn't do anything useful anyway.  :)

Also fixed a really stupid bug in the usb flashdl_disable code.
This commit is contained in:
solomon 2002-06-13 17:21:53 +00:00
parent 515ac44f5c
commit ae1b9d98bf
4 changed files with 8 additions and 7 deletions

View File

@ -43,6 +43,8 @@
* --------------------------------------------------------------------
0.1.14
-pre6
- Fix an alignment bug in the rx path.
- Fix a brown-paper-bag bug in the usb flash code.
- Explicitly enumerate the USB widget endpoints, and use 'em.
- REALLY fix the wlan.conf overwriting.
- More minor cleanups in the PCI/PLX init code.

1
THANKS
View File

@ -86,6 +86,7 @@ Remy Cool <remy.cool@smartology.nl>
Mike Klar <mfklar@tivo.com>
Tony Likhite <tony@likhite.net>
David Everly <deckrider@yahoo.com>
Nick Jafa <jafa@silicondust.com>
[Many, many more. If I've overlooked you and you want to be listed here,
send me e-mail and I'll fix it. I _know_ a bunch of linux-wlan contributors

View File

@ -3732,7 +3732,7 @@ printk("\n");
skb->dev = wlandev->netdev;
/* theoretically align the IP header on a 32-bit word. */
skb_reserve(skb, 2);
/* skb_reserve(skb, 2); */
// XXXX we have a problem with the variable length header?
skb_put(skb, WLAN_HDR_A3_LEN);

View File

@ -1964,11 +1964,8 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)
if ( hw->dlstate != HFA384x_DLSTATE_FLASHENABLED ) {
return -EINVAL;
}
#if 0
WLAN_LOG_DEBUG0(1,"flashdl_enable\n");
hw->dlstate = HFA384x_DLSTATE_DISABLED;
#endif
return 0;
WLAN_LOG_DEBUG0(1,"flashdl_enable\n");
/* There isn't much we can do at this point, so I don't */
/* bother w/ the return value */
@ -2984,6 +2981,7 @@ int hfa384x_drvr_start(hfa384x_t *hw)
WLAN_LOG_ERROR0(__FUNCTION__
": Failed to reset bulk in endpoint.\n");
}
if (usb_clear_halt(hw->usb, usb_sndbulkpipe(hw->usb, hw->endp_out))) {
WLAN_LOG_ERROR0(__FUNCTION__
": Failed to reset bulk out endpoint.\n");
@ -4039,7 +4037,7 @@ printk("\n");
skb->dev->last_rx = jiffies;
/* theoretically align the IP header on a 32-bit word. */
skb_reserve(skb, 2);
/* skb_reserve(skb, 2); */
// XXXX we have a problem with the variable length header?
skb_put(skb, WLAN_HDR_A3_LEN);