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

Commit ae7d27c0 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: Remove last reference to compare_ether_addr 



And use the normal is_<foo>_ether_addr functions and ETH_ALEN too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12a2f3f3

drivers/staging/slicoss/README

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ TODO: 
	- use net_device_ops

	- use dev->stats rather than adapter->stats

	- don't cast netdev_priv it is already void

	- use compare_ether_addr

	- GET RID OF MACROS

	- work on all architectures

	   - without CONFIG_X86_64 confusion

drivers/staging/slicoss/slicoss.c

+8 −13
Original line number Diff line number Diff line
@@ -595,15 +595,12 @@ static void slic_adapter_set_hwaddr(struct adapter *adapter) 
		memcpy(adapter->macaddr,

		       card->config.MacInfo[adapter->functionnumber].macaddrA,

		       sizeof(struct slic_config_mac));

		if (!(adapter->currmacaddr[0] || adapter->currmacaddr[1] ||

		      adapter->currmacaddr[2] || adapter->currmacaddr[3] ||

		      adapter->currmacaddr[4] || adapter->currmacaddr[5])) {

			memcpy(adapter->currmacaddr, adapter->macaddr, 6);

		}

		if (adapter->netdev) {

		if (is_zero_ether_addr(adapter->currmacaddr))

			memcpy(adapter->currmacaddr, adapter->macaddr,

			       ETH_ALEN);

		if (adapter->netdev)

			memcpy(adapter->netdev->dev_addr, adapter->currmacaddr,

			       6);

		}

			       ETH_ALEN);

	}

}
@@ -767,13 +764,11 @@ static bool slic_mac_filter(struct adapter *adapter, 
{

	struct net_device *netdev = adapter->netdev;

	u32 opts = adapter->macopts;

	u32 *dhost4 = (u32 *)&ether_frame->ether_dhost[0];

	u16 *dhost2 = (u16 *)&ether_frame->ether_dhost[4];



	if (opts & MAC_PROMISC)

		return true;



	if ((*dhost4 == 0xFFFFFFFF) && (*dhost2 == 0xFFFF)) {

	if (is_broadcast_ether_addr(ether_frame->ether_dhost)) {

		if (opts & MAC_BCAST) {

			adapter->rcv_broadcasts++;

			return true;
@@ -782,7 +777,7 @@ static bool slic_mac_filter(struct adapter *adapter, 
		}

	}



	if (ether_frame->ether_dhost[0] & 0x01) {

	if (is_multicast_ether_addr(ether_frame->ether_dhost)) {

		if (opts & MAC_ALLMCAST) {

			adapter->rcv_multicasts++;

			netdev->stats.multicast++;
@@ -2335,7 +2330,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address) 
	if (mcaddr == NULL)

		return 1;



	memcpy(mcaddr->address, address, 6);

	memcpy(mcaddr->address, address, ETH_ALEN);



	mcaddr->next = adapter->mcastaddrs;

	adapter->mcastaddrs = mcaddr;