Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b463ced authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarRoy Marples <uberlord@gentoo.org>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8fe2b65a

drivers/net/wireless/prism54/isl_ioctl.c

+4 −1
Original line number Diff line number Diff line
@@ -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,9 +2090,11 @@ 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 */

struct ieee80211_beacon_phdr {

drivers/net/wireless/prism54/islpci_dev.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}