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

Commit a44d4236 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: last nail into proto/ethernet.h 



cleaned up last artifacts used from proto/ethernet.h and
subsequently the file can be removed.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarDowan Kim <dowan@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e661086

drivers/staging/brcm80211/brcmfmac/dhd.h

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ typedef struct dhd_pub { 
	/* Dongle media info */

	bool iswl;		/* Dongle-resident driver is wl */

	unsigned long drv_version;	/* Version of dongle-resident driver */

	struct ether_addr mac;	/* MAC address obtained from dongle */

	u8 mac[ETH_ALEN];			/* MAC address obtained from dongle */

	dngl_stats_t dstats;		/* Stats for dongle-based data */



	/* Additional stats for the bus level */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int dhd_prot_init(dhd_pub_t *dhd) 
		dhd_os_proto_unblock(dhd);

		return ret;

	}

	memcpy(dhd->mac.octet, buf, ETH_ALEN);

	memcpy(dhd->mac, buf, ETH_ALEN);



	dhd_os_proto_unblock(dhd);

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+4 −4
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 
	auth_type = ntoh32(event->auth_type);

	datalen = ntoh32(event->datalen);

	/* debug dump of event messages */

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

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



	event_name = "UNKNOWN";

	for (i = 0; i < ARRAY_SIZE(event_names); i++) {
@@ -1242,7 +1242,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd) 
	int scan_unassoc_time = 40;

#ifdef GET_CUSTOM_MAC_ENABLE

	int ret = 0;

	struct ether_addr ea_addr;

	u8 ea_addr[ETH_ALEN];

#endif				/* GET_CUSTOM_MAC_ENABLE */



	dhd_os_proto_block(dhd);
@@ -1254,9 +1254,9 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd) 
	 ** firmware but unique per board mac address maybe provided by

	 ** customer code

	 */

	ret = dhd_custom_get_mac_address(ea_addr.octet);

	ret = dhd_custom_get_mac_address(ea_addr);

	if (!ret) {

		bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETH_ALEN,

		bcm_mkiovar("cur_etheraddr", (void *)ea_addr, ETH_ALEN,

			    buf, sizeof(buf));

		ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, sizeof(buf));

		if (ret < 0) {

drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ int dhd_custom_get_mac_address(unsigned char *buf) 
#ifdef EXAMPLE_GET_MAC

	/* EXAMPLE code */

	{

		struct ether_addr ea_example = {

		u8 ea_example[ETH_ALEN] = {

			{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF} };

		bcopy((char *)&ea_example, buf, sizeof(struct ether_addr));

		bcopy((char *)ea_example, buf, ETH_ALEN);

	}

#endif				/* EXAMPLE_GET_MAC */

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+5 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <bcmutils.h>

#include <bcmendian.h>



#include <proto/ethernet.h>

#include <dngl_stats.h>

#include <dhd.h>

#include <dhd_bus.h>
@@ -248,7 +247,7 @@ typedef struct dhd_info { 
	struct semaphore sysioc_sem;

	bool set_multicast;

	bool set_macaddress;

	struct ether_addr macvalue;

	u8 macvalue[ETH_ALEN];

	wait_queue_head_t ctrl_wait;

	atomic_t pend_8021x_cnt;
@@ -804,7 +803,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) 
}



static int

_dhd_set_mac_address(dhd_info_t *dhd, int ifidx, struct ether_addr *addr)

_dhd_set_mac_address(dhd_info_t *dhd, int ifidx, u8 *addr)

{

	char buf[32];

	wl_ioctl_t ioc;
@@ -977,7 +976,7 @@ static int _dhd_sysioc_thread(void *data) 
				if (dhd->set_macaddress) {

					dhd->set_macaddress = false;

					_dhd_set_mac_address(dhd, i,

							     &dhd->macvalue);

							     dhd->macvalue);

				}

			}

		}
@@ -1867,7 +1866,7 @@ static int dhd_open(struct net_device *net) 
		}

		atomic_set(&dhd->pend_8021x_cnt, 0);



		memcpy(net->dev_addr, dhd->pub.mac.octet, ETH_ALEN);

		memcpy(net->dev_addr, dhd->pub.mac, ETH_ALEN);



#ifdef TOE

		/* Get current TOE mode from dongle */
@@ -2300,7 +2299,7 @@ int dhd_net_attach(dhd_pub_t *dhdp, int ifidx) 
	 */

	if (ifidx != 0) {

		/* for virtual interfaces use the primary MAC  */

		memcpy(temp_addr, dhd->pub.mac.octet, ETH_ALEN);

		memcpy(temp_addr, dhd->pub.mac, ETH_ALEN);



	}