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

Commit 5c36b99a authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: rework firmware event handling code 



Handling of firmware event has been reworked into a seperate
code file. The change is needed as firmware event can be received
in interrupt context. Decoupling of the event handling has been
lowered to allow event processing to sleep.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 957708f1

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_BRCMFMAC) += brcmfmac.o 
brcmfmac-objs += \

		wl_cfg80211.o \

		fwil.o \

		fweh.o \

		dhd_cdc.o \

		dhd_common.o \

		dhd_linux.o

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

+4 −106
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#define BRCMF_VERSION_STR		"4.218.248.5"



#include "fweh.h"



/*******************************************************************************

 * IO codes that are interpreted by dongle firmware

 ******************************************************************************/
@@ -117,10 +119,6 @@ 
#define DOT11_BSSTYPE_ANY			2

#define DOT11_MAX_DEFAULT_KEYS	4



#define BRCMF_EVENT_MSG_LINK		0x01

#define BRCMF_EVENT_MSG_FLUSHTXQ	0x02

#define BRCMF_EVENT_MSG_GROUP		0x04



#define BRCMF_ESCAN_REQ_VERSION 1



#define WLC_BSS_RSSI_ON_CHANNEL		0x0002
@@ -128,108 +126,6 @@ 
#define BRCMF_MAXRATES_IN_SET		16	/* max # of rates in rateset */

#define BRCMF_STA_ASSOC			0x10		/* Associated */



struct brcmf_event_msg {

	__be16 version;

	__be16 flags;

	__be32 event_type;

	__be32 status;

	__be32 reason;

	__be32 auth_type;

	__be32 datalen;

	u8 addr[ETH_ALEN];

	char ifname[IFNAMSIZ];

	u8 ifidx;

	u8 bsscfgidx;

} __packed;



struct brcm_ethhdr {

	u16 subtype;

	u16 length;

	u8 version;

	u8 oui[3];

	u16 usr_subtype;

} __packed;



struct brcmf_event {

	struct ethhdr eth;

	struct brcm_ethhdr hdr;

	struct brcmf_event_msg msg;

} __packed;



/* event codes sent by the dongle to this driver */

#define BRCMF_E_SET_SSID			0

#define BRCMF_E_JOIN				1

#define BRCMF_E_START				2

#define BRCMF_E_AUTH				3

#define BRCMF_E_AUTH_IND			4

#define BRCMF_E_DEAUTH				5

#define BRCMF_E_DEAUTH_IND			6

#define BRCMF_E_ASSOC				7

#define BRCMF_E_ASSOC_IND			8

#define BRCMF_E_REASSOC				9

#define BRCMF_E_REASSOC_IND			10

#define BRCMF_E_DISASSOC			11

#define BRCMF_E_DISASSOC_IND			12

#define BRCMF_E_QUIET_START			13

#define BRCMF_E_QUIET_END			14

#define BRCMF_E_BEACON_RX			15

#define BRCMF_E_LINK				16

#define BRCMF_E_MIC_ERROR			17

#define BRCMF_E_NDIS_LINK			18

#define BRCMF_E_ROAM				19

#define BRCMF_E_TXFAIL				20

#define BRCMF_E_PMKID_CACHE			21

#define BRCMF_E_RETROGRADE_TSF			22

#define BRCMF_E_PRUNE				23

#define BRCMF_E_AUTOAUTH			24

#define BRCMF_E_EAPOL_MSG			25

#define BRCMF_E_SCAN_COMPLETE			26

#define BRCMF_E_ADDTS_IND			27

#define BRCMF_E_DELTS_IND			28

#define BRCMF_E_BCNSENT_IND			29

#define BRCMF_E_BCNRX_MSG			30

#define BRCMF_E_BCNLOST_MSG			31

#define BRCMF_E_ROAM_PREP			32

#define BRCMF_E_PFN_NET_FOUND			33

#define BRCMF_E_PFN_NET_LOST			34

#define BRCMF_E_RESET_COMPLETE			35

#define BRCMF_E_JOIN_START			36

#define BRCMF_E_ROAM_START			37

#define BRCMF_E_ASSOC_START			38

#define BRCMF_E_IBSS_ASSOC			39

#define BRCMF_E_RADIO				40

#define BRCMF_E_PSM_WATCHDOG			41

#define BRCMF_E_PROBREQ_MSG			44

#define BRCMF_E_SCAN_CONFIRM_IND		45

#define BRCMF_E_PSK_SUP				46

#define BRCMF_E_COUNTRY_CODE_CHANGED		47

#define	BRCMF_E_EXCEEDED_MEDIUM_TIME		48

#define BRCMF_E_ICV_ERROR			49

#define BRCMF_E_UNICAST_DECODE_ERROR		50

#define BRCMF_E_MULTICAST_DECODE_ERROR		51

#define BRCMF_E_TRACE				52

#define BRCMF_E_IF				54

#define BRCMF_E_RSSI				56

#define BRCMF_E_PFN_SCAN_COMPLETE		57

#define BRCMF_E_EXTLOG_MSG			58

#define BRCMF_E_ACTION_FRAME			59

#define BRCMF_E_ACTION_FRAME_COMPLETE		60

#define BRCMF_E_PRE_ASSOC_IND			61

#define BRCMF_E_PRE_REASSOC_IND			62

#define BRCMF_E_CHANNEL_ADOPTED			63

#define BRCMF_E_AP_STARTED			64

#define BRCMF_E_DFS_AP_STOP			65

#define BRCMF_E_DFS_AP_RESUME			66

#define BRCMF_E_RESERVED1			67

#define BRCMF_E_RESERVED2			68

#define BRCMF_E_ESCAN_RESULT			69

#define BRCMF_E_ACTION_FRAME_OFF_CHAN_COMPLETE	70

#define BRCMF_E_DCS_REQUEST			73



#define BRCMF_E_FIFO_CREDIT_MAP			74



#define BRCMF_E_LAST				75



#define BRCMF_E_STATUS_SUCCESS			0

#define BRCMF_E_STATUS_FAIL			1

#define BRCMF_E_STATUS_TIMEOUT			2
@@ -622,6 +518,8 @@ struct brcmf_pub { 
	u8 macvalue[ETH_ALEN];

	atomic_t pend_8021x_cnt;

	wait_queue_head_t pend_8021x_wait;



	struct brcmf_fweh_info fweh;

#ifdef DEBUG

	struct dentry *dbgfs_dir;

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
			 struct sk_buff *pkt, int prec);



/* Receive frame for delivery to OS.  Callee disposes of rxp. */

extern void brcmf_rx_frame(struct device *dev, int ifidx,

extern void brcmf_rx_frame(struct device *dev, u8 ifidx,

			   struct sk_buff_head *rxlist);

static inline void brcmf_rx_packet(struct device *dev, int ifidx,

				   struct sk_buff *pkt)

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

+0 −399
Original line number Diff line number Diff line
@@ -118,405 +118,6 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
	return p != NULL;

}



#ifdef DEBUG

static void

brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)

{

	uint i, status, reason;

	bool group = false, flush_txq = false, link = false;

	char *auth_str, *event_name;

	unsigned char *buf;

	char err_msg[256], eabuf[ETHER_ADDR_STR_LEN];

	static struct {

		uint event;

		char *event_name;

	} event_names[] = {

		{

		BRCMF_E_SET_SSID, "SET_SSID"}, {

		BRCMF_E_JOIN, "JOIN"}, {

		BRCMF_E_START, "START"}, {

		BRCMF_E_AUTH, "AUTH"}, {

		BRCMF_E_AUTH_IND, "AUTH_IND"}, {

		BRCMF_E_DEAUTH, "DEAUTH"}, {

		BRCMF_E_DEAUTH_IND, "DEAUTH_IND"}, {

		BRCMF_E_ASSOC, "ASSOC"}, {

		BRCMF_E_ASSOC_IND, "ASSOC_IND"}, {

		BRCMF_E_REASSOC, "REASSOC"}, {

		BRCMF_E_REASSOC_IND, "REASSOC_IND"}, {

		BRCMF_E_DISASSOC, "DISASSOC"}, {

		BRCMF_E_DISASSOC_IND, "DISASSOC_IND"}, {

		BRCMF_E_QUIET_START, "START_QUIET"}, {

		BRCMF_E_QUIET_END, "END_QUIET"}, {

		BRCMF_E_BEACON_RX, "BEACON_RX"}, {

		BRCMF_E_LINK, "LINK"}, {

		BRCMF_E_MIC_ERROR, "MIC_ERROR"}, {

		BRCMF_E_NDIS_LINK, "NDIS_LINK"}, {

		BRCMF_E_ROAM, "ROAM"}, {

		BRCMF_E_TXFAIL, "TXFAIL"}, {

		BRCMF_E_PMKID_CACHE, "PMKID_CACHE"}, {

		BRCMF_E_RETROGRADE_TSF, "RETROGRADE_TSF"}, {

		BRCMF_E_PRUNE, "PRUNE"}, {

		BRCMF_E_AUTOAUTH, "AUTOAUTH"}, {

		BRCMF_E_EAPOL_MSG, "EAPOL_MSG"}, {

		BRCMF_E_SCAN_COMPLETE, "SCAN_COMPLETE"}, {

		BRCMF_E_ADDTS_IND, "ADDTS_IND"}, {

		BRCMF_E_DELTS_IND, "DELTS_IND"}, {

		BRCMF_E_BCNSENT_IND, "BCNSENT_IND"}, {

		BRCMF_E_BCNRX_MSG, "BCNRX_MSG"}, {

		BRCMF_E_BCNLOST_MSG, "BCNLOST_MSG"}, {

		BRCMF_E_ROAM_PREP, "ROAM_PREP"}, {

		BRCMF_E_PFN_NET_FOUND, "PNO_NET_FOUND"}, {

		BRCMF_E_PFN_NET_LOST, "PNO_NET_LOST"}, {

		BRCMF_E_RESET_COMPLETE, "RESET_COMPLETE"}, {

		BRCMF_E_JOIN_START, "JOIN_START"}, {

		BRCMF_E_ROAM_START, "ROAM_START"}, {

		BRCMF_E_ASSOC_START, "ASSOC_START"}, {

		BRCMF_E_IBSS_ASSOC, "IBSS_ASSOC"}, {

		BRCMF_E_RADIO, "RADIO"}, {

		BRCMF_E_PSM_WATCHDOG, "PSM_WATCHDOG"}, {

		BRCMF_E_PROBREQ_MSG, "PROBREQ_MSG"}, {

		BRCMF_E_SCAN_CONFIRM_IND, "SCAN_CONFIRM_IND"}, {

		BRCMF_E_PSK_SUP, "PSK_SUP"}, {

		BRCMF_E_COUNTRY_CODE_CHANGED, "COUNTRY_CODE_CHANGED"}, {

		BRCMF_E_EXCEEDED_MEDIUM_TIME, "EXCEEDED_MEDIUM_TIME"}, {

		BRCMF_E_ICV_ERROR, "ICV_ERROR"}, {

		BRCMF_E_UNICAST_DECODE_ERROR, "UNICAST_DECODE_ERROR"}, {

		BRCMF_E_MULTICAST_DECODE_ERROR, "MULTICAST_DECODE_ERROR"}, {

		BRCMF_E_TRACE, "TRACE"}, {

		BRCMF_E_ACTION_FRAME, "ACTION FRAME"}, {

		BRCMF_E_ACTION_FRAME_COMPLETE, "ACTION FRAME TX COMPLETE"}, {

		BRCMF_E_IF, "IF"}, {

		BRCMF_E_RSSI, "RSSI"}, {

		BRCMF_E_PFN_SCAN_COMPLETE, "SCAN_COMPLETE"}, {

		BRCMF_E_ESCAN_RESULT, "ESCAN_RESULT"}

	};

	uint event_type, flags, auth_type, datalen;

	static u32 seqnum_prev;

	struct msgtrace_hdr hdr;

	u32 nblost;

	char *s, *p;



	event_type = be32_to_cpu(event->event_type);

	flags = be16_to_cpu(event->flags);

	status = be32_to_cpu(event->status);

	reason = be32_to_cpu(event->reason);

	auth_type = be32_to_cpu(event->auth_type);

	datalen = be32_to_cpu(event->datalen);

	/* debug dump of event messages */

	sprintf(eabuf, "%pM", event->addr);



	event_name = "UNKNOWN";

	for (i = 0; i < ARRAY_SIZE(event_names); i++) {

		if (event_names[i].event == event_type)

			event_name = event_names[i].event_name;

	}



	brcmf_dbg(EVENT, "EVENT: %s, event ID = %d\n", event_name, event_type);

	brcmf_dbg(EVENT, "flags 0x%04x, status %d, reason %d, auth_type %d MAC %s\n",

		  flags, status, reason, auth_type, eabuf);



	if (flags & BRCMF_EVENT_MSG_LINK)

		link = true;

	if (flags & BRCMF_EVENT_MSG_GROUP)

		group = true;

	if (flags & BRCMF_EVENT_MSG_FLUSHTXQ)

		flush_txq = true;



	switch (event_type) {

	case BRCMF_E_START:

	case BRCMF_E_DEAUTH:

	case BRCMF_E_DISASSOC:

		brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);

		break;



	case BRCMF_E_ASSOC_IND:

	case BRCMF_E_REASSOC_IND:

		brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);

		break;



	case BRCMF_E_ASSOC:

	case BRCMF_E_REASSOC:

		if (status == BRCMF_E_STATUS_SUCCESS)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, SUCCESS\n",

				  event_name, eabuf);

		else if (status == BRCMF_E_STATUS_TIMEOUT)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, TIMEOUT\n",

				  event_name, eabuf);

		else if (status == BRCMF_E_STATUS_FAIL)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, FAILURE, reason %d\n",

				  event_name, eabuf, (int)reason);

		else

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, unexpected status %d\n",

				  event_name, eabuf, (int)status);

		break;



	case BRCMF_E_DEAUTH_IND:

	case BRCMF_E_DISASSOC_IND:

		brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, reason %d\n",

			  event_name, eabuf, (int)reason);

		break;



	case BRCMF_E_AUTH:

	case BRCMF_E_AUTH_IND:

		if (auth_type == WLAN_AUTH_OPEN)

			auth_str = "Open System";

		else if (auth_type == WLAN_AUTH_SHARED_KEY)

			auth_str = "Shared Key";

		else {

			sprintf(err_msg, "AUTH unknown: %d", (int)auth_type);

			auth_str = err_msg;

		}

		if (event_type == BRCMF_E_AUTH_IND)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s\n",

				  event_name, eabuf, auth_str);

		else if (status == BRCMF_E_STATUS_SUCCESS)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, SUCCESS\n",

				  event_name, eabuf, auth_str);

		else if (status == BRCMF_E_STATUS_TIMEOUT)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, TIMEOUT\n",

				  event_name, eabuf, auth_str);

		else if (status == BRCMF_E_STATUS_FAIL) {

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, FAILURE, reason %d\n",

				  event_name, eabuf, auth_str, (int)reason);

		}



		break;



	case BRCMF_E_JOIN:

	case BRCMF_E_ROAM:

	case BRCMF_E_SET_SSID:

		if (status == BRCMF_E_STATUS_SUCCESS)

			brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n",

				  event_name, eabuf);

		else if (status == BRCMF_E_STATUS_FAIL)

			brcmf_dbg(EVENT, "MACEVENT: %s, failed\n", event_name);

		else if (status == BRCMF_E_STATUS_NO_NETWORKS)

			brcmf_dbg(EVENT, "MACEVENT: %s, no networks found\n",

				  event_name);

		else

			brcmf_dbg(EVENT, "MACEVENT: %s, unexpected status %d\n",

				  event_name, (int)status);

		break;



	case BRCMF_E_BEACON_RX:

		if (status == BRCMF_E_STATUS_SUCCESS)

			brcmf_dbg(EVENT, "MACEVENT: %s, SUCCESS\n", event_name);

		else if (status == BRCMF_E_STATUS_FAIL)

			brcmf_dbg(EVENT, "MACEVENT: %s, FAIL\n", event_name);

		else

			brcmf_dbg(EVENT, "MACEVENT: %s, status %d\n",

				  event_name, status);

		break;



	case BRCMF_E_LINK:

		brcmf_dbg(EVENT, "MACEVENT: %s %s\n",

			  event_name, link ? "UP" : "DOWN");

		break;



	case BRCMF_E_MIC_ERROR:

		brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, Group %d, Flush %d\n",

			  event_name, eabuf, group, flush_txq);

		break;



	case BRCMF_E_ICV_ERROR:

	case BRCMF_E_UNICAST_DECODE_ERROR:

	case BRCMF_E_MULTICAST_DECODE_ERROR:

		brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);

		break;



	case BRCMF_E_TXFAIL:

		brcmf_dbg(EVENT, "MACEVENT: %s, RA %s\n", event_name, eabuf);

		break;



	case BRCMF_E_SCAN_COMPLETE:

	case BRCMF_E_PMKID_CACHE:

		brcmf_dbg(EVENT, "MACEVENT: %s\n", event_name);

		break;



	case BRCMF_E_ESCAN_RESULT:

		brcmf_dbg(EVENT, "MACEVENT: %s\n", event_name);

		datalen = 0;

		break;



	case BRCMF_E_PFN_NET_FOUND:

	case BRCMF_E_PFN_NET_LOST:

	case BRCMF_E_PFN_SCAN_COMPLETE:

		brcmf_dbg(EVENT, "PNOEVENT: %s\n", event_name);

		break;



	case BRCMF_E_PSK_SUP:

	case BRCMF_E_PRUNE:

		brcmf_dbg(EVENT, "MACEVENT: %s, status %d, reason %d\n",

			  event_name, (int)status, (int)reason);

		break;



	case BRCMF_E_TRACE:

		buf = (unsigned char *) event_data;

		memcpy(&hdr, buf, sizeof(struct msgtrace_hdr));



		if (hdr.version != MSGTRACE_VERSION) {

			brcmf_dbg(ERROR,

				  "MACEVENT: %s [unsupported version --> brcmf"

				  " version:%d dongle version:%d]\n",

				  event_name, MSGTRACE_VERSION, hdr.version);

			/* Reset datalen to avoid display below */

			datalen = 0;

			break;

		}



		/* There are 2 bytes available at the end of data */

		*(buf + sizeof(struct msgtrace_hdr)

			 + be16_to_cpu(hdr.len)) = '\0';



		if (be32_to_cpu(hdr.discarded_bytes)

		    || be32_to_cpu(hdr.discarded_printf))

			brcmf_dbg(ERROR,

				  "WLC_E_TRACE: [Discarded traces in dongle -->"

				  " discarded_bytes %d discarded_printf %d]\n",

				  be32_to_cpu(hdr.discarded_bytes),

				  be32_to_cpu(hdr.discarded_printf));



		nblost = be32_to_cpu(hdr.seqnum) - seqnum_prev - 1;

		if (nblost > 0)

			brcmf_dbg(ERROR, "WLC_E_TRACE: [Event lost --> seqnum "

				  " %d nblost %d\n", be32_to_cpu(hdr.seqnum),

				  nblost);

		seqnum_prev = be32_to_cpu(hdr.seqnum);



		/* Display the trace buffer. Advance from \n to \n to

		 * avoid display big

		 * printf (issue with Linux printk )

		 */

		p = (char *)&buf[sizeof(struct msgtrace_hdr)];

		while ((s = strstr(p, "\n")) != NULL) {

			*s = '\0';

			pr_debug("%s\n", p);

			p = s + 1;

		}

		pr_debug("%s\n", p);



		/* Reset datalen to avoid display below */

		datalen = 0;

		break;



	case BRCMF_E_RSSI:

		brcmf_dbg(EVENT, "MACEVENT: %s %d\n",

			  event_name, be32_to_cpu(*((__be32 *)event_data)));

		break;



	default:

		brcmf_dbg(EVENT,

			  "MACEVENT: %s %d, MAC %s, status %d, reason %d, "

			  "auth %d\n", event_name, event_type, eabuf,

			  (int)status, (int)reason, (int)auth_type);

		break;

	}



	/* show any appended data */

	brcmf_dbg_hex_dump(datalen, event_data, datalen, "Received data");

}

#endif				/* DEBUG */



int

brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,

		   struct brcmf_event_msg *event, void **data_ptr)

{

	/* check whether packet is a BRCM event pkt */

	struct brcmf_event *pvt_data = (struct brcmf_event *) pktdata;

	struct brcmf_if_event *ifevent;

	struct brcmf_if *ifp;

	char *event_data;

	u32 type, status;

	u16 flags;

	int evlen;



	if (memcmp(BRCM_OUI, &pvt_data->hdr.oui[0], DOT11_OUI_LEN)) {

		brcmf_dbg(ERROR, "mismatched OUI, bailing\n");

		return -EBADE;

	}



	/* BRCM event pkt may be unaligned - use xxx_ua to load user_subtype. */

	if (get_unaligned_be16(&pvt_data->hdr.usr_subtype) !=

	    BCMILCP_BCM_SUBTYPE_EVENT) {

		brcmf_dbg(ERROR, "mismatched subtype, bailing\n");

		return -EBADE;

	}



	*data_ptr = &pvt_data[1];

	event_data = *data_ptr;



	/* memcpy since BRCM event pkt may be unaligned. */

	memcpy(event, &pvt_data->msg, sizeof(struct brcmf_event_msg));



	type = get_unaligned_be32(&event->event_type);

	flags = get_unaligned_be16(&event->flags);

	status = get_unaligned_be32(&event->status);

	evlen = get_unaligned_be32(&event->datalen) +

		sizeof(struct brcmf_event);



	switch (type) {

	case BRCMF_E_IF:

		ifevent = (struct brcmf_if_event *) event_data;

		brcmf_dbg(TRACE, "if event\n");



		if (ifevent->ifidx > 0 && ifevent->ifidx < BRCMF_MAX_IFS) {

			if (ifevent->action == BRCMF_E_IF_ADD) {

				ifp = brcmf_add_if(drvr->dev, ifevent->ifidx,

						   ifevent->bssidx,

						   event->ifname,

						   pvt_data->eth.h_dest);

				if (IS_ERR(ifp))

					return PTR_ERR(ifp);

				brcmf_net_attach(ifp);

			} else {

				brcmf_del_if(drvr, ifevent->ifidx);

			}

		} else {

			brcmf_dbg(ERROR, "Invalid ifidx %d for %s\n",

				  ifevent->ifidx, event->ifname);

		}



		/* send up the if event: btamp user needs it */

		*ifidx = brcmf_ifname2idx(drvr, event->ifname);

		break;



		/* These are what external supplicant/authenticator wants */

	case BRCMF_E_LINK:

	case BRCMF_E_ASSOC_IND:

	case BRCMF_E_REASSOC_IND:

	case BRCMF_E_DISASSOC_IND:

	case BRCMF_E_MIC_ERROR:

	default:

		/* Fall through: this should get _everything_  */



		*ifidx = brcmf_ifname2idx(drvr, event->ifname);

		brcmf_dbg(TRACE, "MAC event %d, flags %x, status %x\n",

			  type, flags, status);



		/* put it back to BRCMF_E_NDIS_LINK */

		if (type == BRCMF_E_NDIS_LINK) {

			u32 temp1;

			__be32 temp2;



			temp1 = get_unaligned_be32(&event->event_type);

			brcmf_dbg(TRACE, "Converted to WLC_E_LINK type %d\n",

				  temp1);



			temp2 = cpu_to_be32(BRCMF_E_NDIS_LINK);

			memcpy((void *)(&pvt_data->msg.event_type), &temp2,

			       sizeof(pvt_data->msg.event_type));

		}

		break;

	}



#ifdef DEBUG

	if (BRCMF_EVENT_ON())

		brcmf_c_show_host_event(event, event_data);

#endif /* DEBUG */



	return 0;

}



/* Convert user's input in hex pattern to byte-size mask */

static int brcmf_c_pattern_atoh(char *src, char *dst)

{

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

+13 −26
Original line number Diff line number Diff line
@@ -294,33 +294,13 @@ void brcmf_txflowblock(struct device *dev, bool state) 
		}

}



static int brcmf_host_event(struct brcmf_pub *drvr, int *ifidx,

			    void *pktdata, struct brcmf_event_msg *event,

			    void **data)

{

	int bcmerror = 0;



	bcmerror = brcmf_c_host_event(drvr, ifidx, pktdata, event, data);

	if (bcmerror != 0)

		return bcmerror;



	/* only forward if interface has netdev */

	if (drvr->iflist[*ifidx]->ndev)

		brcmf_cfg80211_event(drvr->iflist[*ifidx],

				     event, *data);



	return bcmerror;

}



void brcmf_rx_frame(struct device *dev, int ifidx,

void brcmf_rx_frame(struct device *dev, u8 ifidx,

		    struct sk_buff_head *skb_list)

{

	unsigned char *eth;

	uint len;

	void *data;

	struct sk_buff *skb, *pnext;

	struct brcmf_if *ifp;

	struct brcmf_event_msg event;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;
@@ -367,10 +347,7 @@ void brcmf_rx_frame(struct device *dev, int ifidx, 
		skb_pull(skb, ETH_HLEN);



		/* Process special event packets and then discard them */

		if (ntohs(skb->protocol) == ETH_P_LINK_CTL)

			brcmf_host_event(drvr, &ifidx,

					  skb_mac_header(skb),

					  &event, &data);

		brcmf_fweh_process_skb(drvr, skb, &ifidx);



		if (drvr->iflist[ifidx]) {

			ifp = drvr->iflist[ifidx];
@@ -823,6 +800,9 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev) 
		goto fail;

	}



	/* attach firmware event handler */

	brcmf_fweh_attach(drvr);



	INIT_WORK(&drvr->setmacaddr_work, _brcmf_set_mac_address);

	INIT_WORK(&drvr->multicast_work, _brcmf_set_multicast_list);
@@ -873,10 +853,14 @@ int brcmf_bus_start(struct device *dev) 
		goto fail;

	}



	ret = brcmf_fweh_activate_events(ifp);

	if (ret < 0)

		goto fail;



	ret = brcmf_net_attach(ifp);

fail:

	if (ret < 0) {

		brcmf_dbg(ERROR, "brcmf_net_attach failed");

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

		if (drvr->config)

			brcmf_cfg80211_detach(drvr->config);

		free_netdev(drvr->iflist[0]->ndev);
@@ -911,6 +895,9 @@ void brcmf_detach(struct device *dev) 
	if (drvr == NULL)

		return;



	/* stop firmware event handling */

	brcmf_fweh_detach(drvr);



	/* make sure primary interface removed last */

	for (i = BRCMF_MAX_IFS-1; i > -1; i--)

		if (drvr->iflist[i])