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

Commit dcb1471b authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: use bphy_err() in all wiphy-related code 



This recently added macro provides more meaningful error messages thanks
to identifying a specific wiphy. It's especially important on systems
with few cards supported by the same (brcmfmac) driver.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c7ff1bfe

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+11 −11
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	*fwerr = 0;

	ret = brcmf_proto_bcdc_msg(drvr, ifidx, cmd, buf, len, false);

	if (ret < 0) {

		brcmf_err("brcmf_proto_bcdc_msg failed w/status %d\n",

		bphy_err(drvr, "brcmf_proto_bcdc_msg failed w/status %d\n",

			 ret);

		goto done;

	}
@@ -195,7 +195,7 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	if ((id < bcdc->reqid) && (++retries < RETRIES))

		goto retry;

	if (id != bcdc->reqid) {

		brcmf_err("%s: unexpected request id %d (expected %d)\n",

		bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",

			 brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,

			 bcdc->reqid);

		ret = -EINVAL;
@@ -245,7 +245,7 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	id = (flags & BCDC_DCMD_ID_MASK) >> BCDC_DCMD_ID_SHIFT;



	if (id != bcdc->reqid) {

		brcmf_err("%s: unexpected request id %d (expected %d)\n",

		bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",

			 brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,

			 bcdc->reqid);

		ret = -EINVAL;
@@ -312,7 +312,7 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws, 
	}

	if (((h->flags & BCDC_FLAG_VER_MASK) >> BCDC_FLAG_VER_SHIFT) !=

	    BCDC_PROTO_VER) {

		brcmf_err("%s: non-BCDC packet received, flags 0x%x\n",

		bphy_err(drvr, "%s: non-BCDC packet received, flags 0x%x\n",

			 brcmf_ifname(tmp_if), h->flags);

		return -EBADE;

	}
@@ -460,7 +460,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 


	/* ensure that the msg buf directly follows the cdc msg struct */

	if ((unsigned long)(&bcdc->msg + 1) != (unsigned long)bcdc->buf) {

		brcmf_err("struct brcmf_proto_bcdc is not correctly defined\n");

		bphy_err(drvr, "struct brcmf_proto_bcdc is not correctly defined\n");

		goto fail;

	}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+21 −18
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct brcmf_mp_global_t brcmf_mp_global; 


void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	struct brcmf_join_pref_params join_pref_params[2];

	int err;
@@ -106,7 +107,7 @@ void brcmf_c_set_joinpref_default(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,

				       sizeof(join_pref_params));

	if (err)

		brcmf_err("Set join_pref error (%d)\n", err);

		bphy_err(drvr, "Set join_pref error (%d)\n", err);

}



static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,
@@ -129,7 +130,8 @@ static int brcmf_c_download(struct brcmf_if *ifp, u16 flag, 


static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)

{

	struct brcmf_bus *bus = ifp->drvr->bus_if;

	struct brcmf_pub *drvr = ifp->drvr;

	struct brcmf_bus *bus = drvr->bus_if;

	struct brcmf_dload_data_le *chunk_buf;

	const struct firmware *clm = NULL;

	u8 clm_name[BRCMF_FW_NAME_LEN];
@@ -145,7 +147,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) 
	memset(clm_name, 0, sizeof(clm_name));

	err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name);

	if (err) {

		brcmf_err("get CLM blob file name failed (%d)\n", err);

		bphy_err(drvr, "get CLM blob file name failed (%d)\n", err);

		return err;

	}
@@ -182,12 +184,12 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) 
	} while ((datalen > 0) && (err == 0));



	if (err) {

		brcmf_err("clmload (%zu byte file) failed (%d); ",

		bphy_err(drvr, "clmload (%zu byte file) failed (%d)\n",

			 clm->size, err);

		/* Retrieve clmload_status and print */

		err = brcmf_fil_iovar_int_get(ifp, "clmload_status", &status);

		if (err)

			brcmf_err("get clmload_status failed (%d)\n", err);

			bphy_err(drvr, "get clmload_status failed (%d)\n", err);

		else

			brcmf_dbg(INFO, "clmload_status=%d\n", status);

		err = -EIO;
@@ -201,6 +203,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) 


int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	s8 eventmask[BRCMF_EVENTING_MASK_LEN];

	u8 buf[BRCMF_DCMD_SMLEN];

	struct brcmf_bus *bus;
@@ -214,7 +217,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,

				       sizeof(ifp->mac_addr));

	if (err < 0) {

		brcmf_err("Retrieving cur_etheraddr failed, %d\n", err);

		bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);

		goto done;

	}

	memcpy(ifp->drvr->wiphy->perm_addr, ifp->drvr->mac, ETH_ALEN);
@@ -226,7 +229,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO,

				     &revinfo, sizeof(revinfo));

	if (err < 0) {

		brcmf_err("retrieving revision info failed, %d\n", err);

		bphy_err(drvr, "retrieving revision info failed, %d\n", err);

		strlcpy(ri->chipname, "UNKNOWN", sizeof(ri->chipname));

	} else {

		ri->vendorid = le32_to_cpu(revinfo.vendorid);
@@ -260,7 +263,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	/* Do any CLM downloading */

	err = brcmf_c_process_clm_blob(ifp);

	if (err < 0) {

		brcmf_err("download CLM blob file failed, %d\n", err);

		bphy_err(drvr, "download CLM blob file failed, %d\n", err);

		goto done;

	}
@@ -269,7 +272,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	strcpy(buf, "ver");

	err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));

	if (err < 0) {

		brcmf_err("Retrieving version information failed, %d\n",

		bphy_err(drvr, "Retrieving version information failed, %d\n",

			 err);

		goto done;

	}
@@ -304,7 +307,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	/* set mpc */

	err = brcmf_fil_iovar_int_set(ifp, "mpc", 1);

	if (err) {

		brcmf_err("failed setting mpc\n");

		bphy_err(drvr, "failed setting mpc\n");

		goto done;

	}
@@ -314,14 +317,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,

				       BRCMF_EVENTING_MASK_LEN);

	if (err) {

		brcmf_err("Get event_msgs error (%d)\n", err);

		bphy_err(drvr, "Get event_msgs error (%d)\n", err);

		goto done;

	}

	setbit(eventmask, BRCMF_E_IF);

	err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,

				       BRCMF_EVENTING_MASK_LEN);

	if (err) {

		brcmf_err("Set event_msgs error (%d)\n", err);

		bphy_err(drvr, "Set event_msgs error (%d)\n", err);

		goto done;

	}
@@ -329,7 +332,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,

				    BRCMF_DEFAULT_SCAN_CHANNEL_TIME);

	if (err) {

		brcmf_err("BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",

		bphy_err(drvr, "BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",

			 err);

		goto done;

	}
@@ -338,7 +341,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,

				    BRCMF_DEFAULT_SCAN_UNASSOC_TIME);

	if (err) {

		brcmf_err("BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",

		bphy_err(drvr, "BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",

			 err);

		goto done;

	}

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

+39 −35
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx) 
	s32 bsscfgidx;



	if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {

		brcmf_err("ifidx %d out of range\n", ifidx);

		bphy_err(drvr, "ifidx %d out of range\n", ifidx);

		return NULL;

	}
@@ -141,7 +141,9 @@ void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable) 


static void _brcmf_set_multicast_list(struct work_struct *work)

{

	struct brcmf_if *ifp;

	struct brcmf_if *ifp = container_of(work, struct brcmf_if,

					    multicast_work);

	struct brcmf_pub *drvr = ifp->drvr;

	struct net_device *ndev;

	struct netdev_hw_addr *ha;

	u32 cmd_value, cnt;
@@ -150,8 +152,6 @@ static void _brcmf_set_multicast_list(struct work_struct *work) 
	u32 buflen;

	s32 err;



	ifp = container_of(work, struct brcmf_if, multicast_work);



	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);



	ndev = ifp->ndev;
@@ -181,7 +181,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work) 


	err = brcmf_fil_iovar_data_set(ifp, "mcast_list", buf, buflen);

	if (err < 0) {

		brcmf_err("Setting mcast_list failed, %d\n", err);

		bphy_err(drvr, "Setting mcast_list failed, %d\n", err);

		cmd_value = cnt ? true : cmd_value;

	}
@@ -194,13 +194,13 @@ static void _brcmf_set_multicast_list(struct work_struct *work) 
	 */

	err = brcmf_fil_iovar_int_set(ifp, "allmulti", cmd_value);

	if (err < 0)

		brcmf_err("Setting allmulti failed, %d\n", err);

		bphy_err(drvr, "Setting allmulti failed, %d\n", err);



	/*Finally, pick up the PROMISC flag */

	cmd_value = (ndev->flags & IFF_PROMISC) ? true : false;

	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PROMISC, cmd_value);

	if (err < 0)

		brcmf_err("Setting BRCMF_C_SET_PROMISC failed, %d\n",

		bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, %d\n",

			 err);

	brcmf_configure_arp_nd_offload(ifp, !cmd_value);

}
@@ -208,11 +208,11 @@ static void _brcmf_set_multicast_list(struct work_struct *work) 
#if IS_ENABLED(CONFIG_IPV6)

static void _brcmf_update_ndtable(struct work_struct *work)

{

	struct brcmf_if *ifp;

	struct brcmf_if *ifp = container_of(work, struct brcmf_if,

					    ndoffload_work);

	struct brcmf_pub *drvr = ifp->drvr;

	int i, ret;



	ifp = container_of(work, struct brcmf_if, ndoffload_work);



	/* clear the table in firmware */

	ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip_clear", NULL, 0);

	if (ret) {
@@ -225,7 +225,7 @@ static void _brcmf_update_ndtable(struct work_struct *work) 
					       &ifp->ipv6_addr_tbl[i],

					       sizeof(struct in6_addr));

		if (ret)

			brcmf_err("add nd ip err %d\n", ret);

			bphy_err(drvr, "add nd ip err %d\n", ret);

	}

}

#else
@@ -238,6 +238,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr) 
{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct sockaddr *sa = (struct sockaddr *)addr;

	struct brcmf_pub *drvr = ifp->drvr;

	int err;



	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
@@ -245,7 +246,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr) 
	err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,

				       ETH_ALEN);

	if (err < 0) {

		brcmf_err("Setting cur_etheraddr failed, %d\n", err);

		bphy_err(drvr, "Setting cur_etheraddr failed, %d\n", err);

	} else {

		brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);

		memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
@@ -305,7 +306,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 


	/* Can the device send data? */

	if (drvr->bus_if->state != BRCMF_BUS_UP) {

		brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);

		bphy_err(drvr, "xmit rejected state=%d\n", drvr->bus_if->state);

		netif_stop_queue(ndev);

		dev_kfree_skb(skb);

		ret = -ENODEV;
@@ -339,7 +340,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
		ret = pskb_expand_head(skb, ALIGN(head_delta, NET_SKB_PAD), 0,

				       GFP_ATOMIC);

		if (ret < 0) {

			brcmf_err("%s: failed to expand headroom\n",

			bphy_err(drvr, "%s: failed to expand headroom\n",

				 brcmf_ifname(ifp));

			atomic_inc(&drvr->bus_if->stats.pktcow_failed);

			goto done;
@@ -607,7 +608,7 @@ static int brcmf_netdev_open(struct net_device *ndev) 


	/* If bus is not ready, can't continue */

	if (bus_if->state != BRCMF_BUS_UP) {

		brcmf_err("failed bus is not ready\n");

		bphy_err(drvr, "failed bus is not ready\n");

		return -EAGAIN;

	}
@@ -621,7 +622,7 @@ static int brcmf_netdev_open(struct net_device *ndev) 
		ndev->features &= ~NETIF_F_IP_CSUM;



	if (brcmf_cfg80211_up(ndev)) {

		brcmf_err("failed to bring up cfg80211\n");

		bphy_err(drvr, "failed to bring up cfg80211\n");

		return -EIO;

	}
@@ -666,7 +667,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) 
	else

		err = register_netdev(ndev);

	if (err != 0) {

		brcmf_err("couldn't register the net device\n");

		bphy_err(drvr, "couldn't register the net device\n");

		goto fail;

	}
@@ -743,6 +744,7 @@ static const struct net_device_ops brcmf_netdev_ops_p2p = { 


static int brcmf_net_p2p_attach(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	struct net_device *ndev;



	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
@@ -755,7 +757,7 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp) 
	memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);



	if (register_netdev(ndev) != 0) {

		brcmf_err("couldn't register the p2p net device\n");

		bphy_err(drvr, "couldn't register the p2p net device\n");

		goto fail;

	}
@@ -784,7 +786,7 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, 
	 */

	if (ifp) {

		if (ifidx) {

			brcmf_err("ERROR: netdev:%s already exists\n",

			bphy_err(drvr, "ERROR: netdev:%s already exists\n",

				 ifp->ndev->name);

			netif_stop_queue(ifp->ndev);

			brcmf_net_detach(ifp->ndev, false);
@@ -843,7 +845,7 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, 
	ifp = drvr->iflist[bsscfgidx];

	drvr->iflist[bsscfgidx] = NULL;

	if (!ifp) {

		brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);

		bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx);

		return;

	}

	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
@@ -893,16 +895,17 @@ static int brcmf_psm_watchdog_notify(struct brcmf_if *ifp, 
				     const struct brcmf_event_msg *evtmsg,

				     void *data)

{

	struct brcmf_pub *drvr = ifp->drvr;

	int err;



	brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);



	brcmf_err("PSM's watchdog has fired!\n");

	bphy_err(drvr, "PSM's watchdog has fired!\n");



	err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,

					 evtmsg->datalen);

	if (err)

		brcmf_err("Failed to get memory dump, %d\n", err);

		bphy_err(drvr, "Failed to get memory dump, %d\n", err);



	return err;

}
@@ -946,7 +949,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb, 
	ret = brcmf_fil_iovar_data_get(ifp, "arp_hostip", addr_table,

				       sizeof(addr_table));

	if (ret) {

		brcmf_err("fail to get arp ip table err:%d\n", ret);

		bphy_err(drvr, "fail to get arp ip table err:%d\n", ret);

		return NOTIFY_OK;

	}
@@ -963,7 +966,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb, 
			ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip",

				&ifa->ifa_address, sizeof(ifa->ifa_address));

			if (ret)

				brcmf_err("add arp ip err %d\n", ret);

				bphy_err(drvr, "add arp ip err %d\n", ret);

		}

		break;

	case NETDEV_DOWN:
@@ -975,7 +978,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb, 
			ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip_clear",

						       NULL, 0);

			if (ret) {

				brcmf_err("fail to clear arp ip table err:%d\n",

				bphy_err(drvr, "fail to clear arp ip table err:%d\n",

					 ret);

				return NOTIFY_OK;

			}
@@ -986,7 +989,7 @@ static int brcmf_inetaddr_changed(struct notifier_block *nb, 
							       &addr_table[i],

							       sizeof(addr_table[i]));

				if (ret)

					brcmf_err("add arp ip err %d\n",

					bphy_err(drvr, "add arp ip err %d\n",

						 ret);

			}

		}
@@ -1161,7 +1164,7 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops) 
	return 0;



fail:

	brcmf_err("failed: %d\n", ret);

	bphy_err(drvr, "failed: %d\n", ret);

	if (drvr->config) {

		brcmf_cfg80211_detach(drvr->config);

		drvr->config = NULL;
@@ -1213,7 +1216,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 
	/* Attach and link in the protocol */

	ret = brcmf_proto_attach(drvr);

	if (ret != 0) {

		brcmf_err("brcmf_prot_attach failed\n");

		bphy_err(drvr, "brcmf_prot_attach failed\n");

		goto fail;

	}
@@ -1226,7 +1229,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 


	ret = brcmf_bus_started(drvr, ops);

	if (ret != 0) {

		brcmf_err("dongle is not responding: err=%d\n", ret);

		bphy_err(drvr, "dongle is not responding: err=%d\n", ret);

		goto fail;

	}
@@ -1326,6 +1329,7 @@ static int brcmf_get_pend_8021x_cnt(struct brcmf_if *ifp) 


int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	int err;



	err = wait_event_timeout(ifp->pend_8021x_wait,
@@ -1333,7 +1337,7 @@ int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp) 
				 MAX_WAIT_FOR_8021X_TX);



	if (!err)

		brcmf_err("Timed out waiting for no pending 802.1x packets\n");

		bphy_err(drvr, "Timed out waiting for no pending 802.1x packets\n");



	return !err;

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c

+5 −3
Original line number Diff line number Diff line
@@ -185,13 +185,14 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp, 
#define MAX_CAPS_BUFFER_SIZE	768

static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	char caps[MAX_CAPS_BUFFER_SIZE];

	enum brcmf_feat_id id;

	int i, err;



	err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));

	if (err) {

		brcmf_err("could not get firmware cap (%d)\n", err);

		bphy_err(drvr, "could not get firmware cap (%d)\n", err);

		return;

	}
@@ -216,14 +217,15 @@ static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp) 
static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)

{

	struct brcmf_bus *bus_if = dev_get_drvdata(seq->private);

	struct brcmf_if *ifp = brcmf_get_ifp(bus_if->drvr, 0);

	struct brcmf_pub *drvr = bus_if->drvr;

	struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);

	char caps[MAX_CAPS_BUFFER_SIZE + 1] = { };

	char *tmp;

	int err;



	err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));

	if (err) {

		brcmf_err("could not get firmware cap (%d)\n", err);

		bphy_err(drvr, "could not get firmware cap (%d)\n", err);

		return err;

	}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c

+14 −11
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static void brcmf_fweh_queue_event(struct brcmf_fweh_info *fweh, 
	schedule_work(&fweh->event_work);

}



static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,

static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,

					 struct brcmf_if *ifp,

					 enum brcmf_fweh_event_code code,

					 struct brcmf_event_msg *emsg,

					 void *data)
@@ -117,9 +118,9 @@ static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp, 
		if (fweh->evt_handler[code])

			err = fweh->evt_handler[code](ifp, emsg, data);

		else

			brcmf_err("unhandled event %d ignored\n", code);

			bphy_err(drvr, "unhandled event %d ignored\n", code);

	} else {

		brcmf_err("no interface object\n");

		bphy_err(drvr, "no interface object\n");

	}

	return err;

}
@@ -158,7 +159,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
		return;

	}

	if (ifevent->ifidx >= BRCMF_MAX_IFS) {

		brcmf_err("invalid interface index: %u\n", ifevent->ifidx);

		bphy_err(drvr, "invalid interface index: %u\n", ifevent->ifidx);

		return;

	}
@@ -181,7 +182,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
	if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)

		brcmf_proto_reset_if(drvr, ifp);



	err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);

	err = brcmf_fweh_call_event_handler(drvr, ifp, emsg->event_code, emsg,

					    data);



	if (ifp && ifevent->action == BRCMF_E_IF_DEL) {

		bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
@@ -268,10 +270,10 @@ static void brcmf_fweh_event_worker(struct work_struct *work) 
			ifp = drvr->iflist[0];

		else

			ifp = drvr->iflist[emsg.bsscfgidx];

		err = brcmf_fweh_call_event_handler(ifp, event->code, &emsg,

						    event->data);

		err = brcmf_fweh_call_event_handler(drvr, ifp, event->code,

						    &emsg, event->data);

		if (err) {

			brcmf_err("event handler failed (%d)\n",

			bphy_err(drvr, "event handler failed (%d)\n",

				 event->code);

			err = 0;

		}
@@ -339,7 +341,7 @@ int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code, 
			brcmf_fweh_handler_t handler)

{

	if (drvr->fweh.evt_handler[code]) {

		brcmf_err("event code %d already registered\n", code);

		bphy_err(drvr, "event code %d already registered\n", code);

		return -ENOSPC;

	}

	drvr->fweh.evt_handler[code] = handler;
@@ -369,6 +371,7 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr, 
 */

int brcmf_fweh_activate_events(struct brcmf_if *ifp)

{

	struct brcmf_pub *drvr = ifp->drvr;

	int i, err;

	s8 eventmask[BRCMF_EVENTING_MASK_LEN];
@@ -388,7 +391,7 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_set(ifp, "event_msgs",

				       eventmask, BRCMF_EVENTING_MASK_LEN);

	if (err)

		brcmf_err("Set event_msgs error (%d)\n", err);

		bphy_err(drvr, "Set event_msgs error (%d)\n", err);



	return err;

}