Commit 85b442e3 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

prism54: fix regression with missing carrier in AP-mode

This fixes a regression introduced by commit 7b463ced (prism54: set
carrier flags correctly) which causes the device to come up without
a carrier in AP-mode.
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c4492586
...@@ -388,8 +388,15 @@ islpci_open(struct net_device *ndev) ...@@ -388,8 +388,15 @@ islpci_open(struct net_device *ndev)
netif_start_queue(ndev); netif_start_queue(ndev);
/* Turn off carrier unless we know we have associated */ /* Turn off carrier if in STA or Ad-hoc mode. It will be turned on
netif_carrier_off(ndev); * once the firmware receives a trap of being associated
* (GEN_OID_LINKSTATE). In other modes (AP or WDS or monitor) we
* should just leave the carrier on as its expected the firmware
* won't send us a trigger. */
if (priv->iw_mode == IW_MODE_INFRA || priv->iw_mode == IW_MODE_ADHOC)
netif_carrier_off(ndev);
else
netif_carrier_on(ndev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment