* Use usb_reset_device() on 2.6 kernels (Andreas Schultes)
* Experimentally do the same on 2.4 kernels too...
This commit is contained in:
parent
6d02b1d9e8
commit
b6b7a94ad8
4
CHANGES
4
CHANGES
|
@ -41,7 +41,9 @@
|
|||
* Intersil Corporation as part of PRISM(R) chipset product development.
|
||||
*
|
||||
* --------------------------------------------------------------------
|
||||
0.2.1
|
||||
0.2.1-final
|
||||
- Experimentally try using usb_reset_device on 2.4 kernels too
|
||||
- use usb_reset_device() on 2.6 kernels (Andreas Schulte)
|
||||
- Included kludged 1.8.4 PCI/PCMCIA firmware (Pavel Roskin)
|
||||
- PCMCIA card Ident fixes to coexist with orinioco driver (Pavel Roskin)
|
||||
- Ignore unexpected ctlx responses. (Chris Rankin)
|
||||
|
|
1
THANKS
1
THANKS
|
@ -133,6 +133,7 @@ Andrzej Turowski <andrzej@turowski_NOSPAM_.com>
|
|||
Tim Huck <duceusmeus@yahoo.com>
|
||||
Ekin Meroglu <ekin@fisek.com.tr>
|
||||
Eric Koenders <Eric.Koenders@peekglobal.com>
|
||||
Andreas Schultes <flirt@hold-clan.de>
|
||||
|
||||
[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
|
||||
|
|
|
@ -1567,13 +1567,13 @@ hfa384x_copy_to_aux(
|
|||
----------------------------------------------------------------*/
|
||||
int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
|
||||
{
|
||||
|
||||
#if 0
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
struct usb_device *parent = hw->usb->parent;
|
||||
int i;
|
||||
int port = -1;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
int result = 0;
|
||||
|
||||
|
||||
|
@ -1583,6 +1583,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
|
|||
|
||||
DBFENTER;
|
||||
|
||||
#if 0
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
/* Find the hub port */
|
||||
for ( i = 0; i < parent->maxchild; i++) {
|
||||
|
@ -1631,8 +1632,17 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
|
|||
|
||||
done:
|
||||
#else
|
||||
WLAN_LOG_WARNING("hfa384x_corereset not supported on USB on 2.5/2.6 kernels.\n");
|
||||
result=usb_reset_device(hw->usb);
|
||||
if(result<0) {
|
||||
WLAN_LOG_ERROR("usb_reset_device() failed, result=%d.\n",result);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
result=usb_reset_device(hw->usb);
|
||||
if(result<0) {
|
||||
WLAN_LOG_ERROR("usb_reset_device() failed, result=%d.\n",result);
|
||||
}
|
||||
|
||||
DBFEXIT;
|
||||
return result;
|
||||
|
|
Loading…
Reference in New Issue