mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
prism54: set carrier flags correctly
> prism54 should set the carrier flags correctly when it thinks the > link can be used. Agreed, so sure, this is OK but I rather we turn the carrier on or off *before* sending an event, like this. Signed-off-by: Roy Marples <uberlord@gentoo.org> Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
8fe2b65a18
commit
7b463ced63
@ -2081,6 +2081,7 @@ link_changed(struct net_device *ndev, u32 bitrate)
|
||||
islpci_private *priv = netdev_priv(ndev);
|
||||
|
||||
if (bitrate) {
|
||||
netif_carrier_on(ndev);
|
||||
if (priv->iw_mode == IW_MODE_INFRA) {
|
||||
union iwreq_data uwrq;
|
||||
prism54_get_wap(ndev, NULL, (struct sockaddr *) &uwrq,
|
||||
@ -2089,8 +2090,10 @@ link_changed(struct net_device *ndev, u32 bitrate)
|
||||
} else
|
||||
send_simple_event(netdev_priv(ndev),
|
||||
"Link established");
|
||||
} else
|
||||
} else {
|
||||
netif_carrier_off(ndev);
|
||||
send_simple_event(netdev_priv(ndev), "Link lost");
|
||||
}
|
||||
}
|
||||
|
||||
/* Beacon/ProbeResp payload header */
|
||||
|
@ -387,7 +387,9 @@ islpci_open(struct net_device *ndev)
|
||||
}
|
||||
|
||||
netif_start_queue(ndev);
|
||||
/* netif_mark_up( ndev ); */
|
||||
|
||||
/* Turn off carrier unless we know we have associated */
|
||||
netif_carrier_off(ndev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user