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

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

staging: brcm80211: use mac_pton() instead of own implementation 



The function brcmu_ether_atoe() does exactly the same as mac_pton().
The driver now uses the latter and brcmu_ether_atoe() has been removed
as it is not used anymore.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf4c4f43

drivers/staging/brcm80211/brcmsmac/main.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

 */





#include <linux/pci_ids.h>

#include <linux/pci_ids.h>

#include <linux/if_ether.h>

#include <net/mac80211.h>

#include <net/mac80211.h>

#include <brcm_hw_ids.h>

#include <brcm_hw_ids.h>

#include <aiutils.h>

#include <aiutils.h>
@@ -4584,8 +4585,8 @@ int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device, uint unit, 
		err = 21;

		err = 21;

		goto fail;

		goto fail;

	}

	}

	brcmu_ether_atoe(macaddr, wlc_hw->etheraddr);

	if (!mac_pton(macaddr, wlc_hw->etheraddr) ||

	if (is_broadcast_ether_addr(wlc_hw->etheraddr) ||

	    is_broadcast_ether_addr(wlc_hw->etheraddr) ||

	    is_zero_ether_addr(wlc_hw->etheraddr)) {

	    is_zero_ether_addr(wlc_hw->etheraddr)) {

		wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",

		wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",

			  unit, macaddr);

			  unit, macaddr);

drivers/staging/brcm80211/brcmutil/utils.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -350,21 +350,6 @@ struct sk_buff *brcmu_pktq_mdeq(struct pktq *pq, uint prec_bmp, 
}

}

EXPORT_SYMBOL(brcmu_pktq_mdeq);

EXPORT_SYMBOL(brcmu_pktq_mdeq);





/* parse a xx:xx:xx:xx:xx:xx format ethernet address */

int brcmu_ether_atoe(char *p, u8 *ea)

{

	int i = 0;



	for (;;) {

		ea[i++] = (char)simple_strtoul(p, &p, 16);

		if (!*p++ || i == 6)

			break;

	}



	return i == 6;

}

EXPORT_SYMBOL(brcmu_ether_atoe);



#if defined(BCMDBG)

#if defined(BCMDBG)

/* pretty hex print a pkt buffer chain */

/* pretty hex print a pkt buffer chain */

void brcmu_prpkt(const char *msg, struct sk_buff *p0)

void brcmu_prpkt(const char *msg, struct sk_buff *p0)

drivers/staging/brcm80211/include/brcmu_utils.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -133,9 +133,6 @@ extern uint brcmu_pktfrombuf(struct sk_buff *p, 
	uint offset, int len, unsigned char *buf);

	uint offset, int len, unsigned char *buf);

extern uint brcmu_pkttotlen(struct sk_buff *p);

extern uint brcmu_pkttotlen(struct sk_buff *p);





/* ethernet address */

extern int brcmu_ether_atoe(char *p, u8 *ea);



/* ip address */

/* ip address */

struct ipv4_addr;

struct ipv4_addr;