Staging: wlan-ng: prism2_usb.c always enable the card in probe_usb
always enable card in probe_usb & update register_wlandev to match latest wlan-ng-dev tree. Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
ee313528d9
commit
1d1b69851b
1 changed files with 9 additions and 5 deletions
|
@ -110,11 +110,6 @@ static int prism2sta_probe_usb(
|
||||||
* linux netdevice.
|
* linux netdevice.
|
||||||
*/
|
*/
|
||||||
SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
|
SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
|
||||||
if ( register_wlandev(wlandev) != 0 ) {
|
|
||||||
WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);
|
|
||||||
result = -EIO;
|
|
||||||
goto failed;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Do a chip-level reset on the MAC */
|
/* Do a chip-level reset on the MAC */
|
||||||
if (prism2_doreset) {
|
if (prism2_doreset) {
|
||||||
|
@ -136,6 +131,15 @@ static int prism2sta_probe_usb(
|
||||||
|
|
||||||
wlandev->msdstate = WLAN_MSD_HWPRESENT;
|
wlandev->msdstate = WLAN_MSD_HWPRESENT;
|
||||||
|
|
||||||
|
if ( register_wlandev(wlandev) != 0 ) {
|
||||||
|
WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);
|
||||||
|
result = -EIO;
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* enable the card */
|
||||||
|
prism2sta_ifstate(wlandev, P80211ENUM_ifstate_enable);
|
||||||
|
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
failed:
|
failed:
|
||||||
|
|
Reference in a new issue