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

Commit 92121e69 authored by Hante Meuleman's avatar Hante Meuleman Committed by Kalle Valo
Browse files

brcmfmac: Properly set carrier state of netdev. 



Use the netif_carrier api to correctly set carrier state on the
different modes.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 54b499d9

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+4 −0
Original line number Diff line number Diff line
@@ -4251,6 +4251,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, 
		brcmf_dbg(TRACE, "GO mode configuration complete\n");

	}

	set_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);

	brcmf_net_setcarrier(ifp, true);



exit:

	if ((err) && (!mbss)) {
@@ -4315,6 +4316,7 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev) 
	brcmf_set_mpc(ifp, 1);

	brcmf_configure_arp_offload(ifp, true);

	clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);

	brcmf_net_setcarrier(ifp, false);



	return err;

}
@@ -5024,6 +5026,7 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
				&ifp->vif->sme_state);

		} else

			brcmf_bss_connect_done(cfg, ndev, e, true);

		brcmf_net_setcarrier(ifp, true);

	} else if (brcmf_is_linkdown(e)) {

		brcmf_dbg(CONN, "Linkdown\n");

		if (!brcmf_is_ibssmode(ifp->vif)) {
@@ -5033,6 +5036,7 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
		brcmf_init_prof(ndev_to_prof(ndev));

		if (ndev != cfg_to_ndev(cfg))

			complete(&cfg->vif_disabled);

		brcmf_net_setcarrier(ifp, false);

	} else if (brcmf_is_nonetwork(cfg, e)) {

		if (brcmf_is_ibssmode(ifp->vif))

			clear_bit(BRCMF_VIF_STATUS_CONNECTING,

drivers/net/wireless/brcm80211/brcmfmac/core.c

+21 −4
Original line number Diff line number Diff line
@@ -635,8 +635,7 @@ static int brcmf_netdev_stop(struct net_device *ndev) 


	brcmf_cfg80211_down(ndev);



	/* Set state and stop OS transmissions */

	netif_stop_queue(ndev);

	brcmf_net_setcarrier(ifp, false);



	return 0;

}
@@ -670,8 +669,8 @@ static int brcmf_netdev_open(struct net_device *ndev) 
		return -EIO;

	}



	/* Allow transmit calls */

	netif_start_queue(ndev);

	/* Clear, carrier, set when connected or AP mode. */

	netif_carrier_off(ndev);

	return 0;

}
@@ -736,6 +735,24 @@ static void brcmf_net_detach(struct net_device *ndev) 
		brcmf_cfg80211_free_netdev(ndev);

}



void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)

{

	struct net_device *ndev;



	brcmf_dbg(TRACE, "Enter, idx=%d carrier=%d\n", ifp->bssidx, on);



	ndev = ifp->ndev;

	brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_DISCONNECTED, !on);

	if (on) {

		if (!netif_carrier_ok(ndev))

			netif_carrier_on(ndev);



	} else {

		if (netif_carrier_ok(ndev))

			netif_carrier_off(ndev);

	}

}



static int brcmf_net_p2p_open(struct net_device *ndev)

{

	brcmf_dbg(TRACE, "Enter\n");

drivers/net/wireless/brcm80211/brcmfmac/core.h

+6 −2
Original line number Diff line number Diff line
@@ -154,10 +154,13 @@ struct brcmf_fws_mac_descriptor; 
 *	netif stopped due to firmware signalling flow control.

 * @BRCMF_NETIF_STOP_REASON_FLOW:

 *	netif stopped due to flowring full.

 * @BRCMF_NETIF_STOP_REASON_DISCONNECTED:

 *	netif stopped due to not being connected (STA mode).

 */

enum brcmf_netif_stop_reason {

	BRCMF_NETIF_STOP_REASON_FWS_FC = 1,

	BRCMF_NETIF_STOP_REASON_FLOW = 2

	BRCMF_NETIF_STOP_REASON_FWS_FC = BIT(0),

	BRCMF_NETIF_STOP_REASON_FLOW = BIT(1),

	BRCMF_NETIF_STOP_REASON_DISCONNECTED = BIT(2)

};



/**
@@ -213,5 +216,6 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp, 
			  enum brcmf_netif_stop_reason reason, bool state);

void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);

void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);

void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on);



#endif /* BRCMFMAC_CORE_H */