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

Commit e5a727f6 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

bridge: Use ether_addr_copy and ETH_ALEN 



Convert the more obvious uses of memcpy to ether_addr_copy.

There are still uses of memcpy that could be converted but
these addresses are __aligned(2).

Convert a couple uses of 6 in gr_private.h to ETH_ALEN.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8b39015

net/bridge/br_device.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void br_dev_setup(struct net_device *dev) 
	br->bridge_id.prio[0] = 0x80;

	br->bridge_id.prio[1] = 0x00;



	memcpy(br->group_addr, eth_reserved_addr_base, ETH_ALEN);

	ether_addr_copy(br->group_addr, eth_reserved_addr_base);



	br->stp_enabled = BR_NO_STP;

	br->group_fwd_mask = BR_GROUPFWD_DEFAULT;

net/bridge/br_multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br, 
	skb_reset_mac_header(skb);

	eth = eth_hdr(skb);



	memcpy(eth->h_source, br->dev->dev_addr, ETH_ALEN);

	ether_addr_copy(eth->h_source, br->dev->dev_addr);

	eth->h_dest[0] = 1;

	eth->h_dest[1] = 0;

	eth->h_dest[2] = 0x5e;
@@ -433,7 +433,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, 
	skb_reset_mac_header(skb);

	eth = eth_hdr(skb);



	memcpy(eth->h_source, br->dev->dev_addr, ETH_ALEN);

	ether_addr_copy(eth->h_source, br->dev->dev_addr);

	eth->h_proto = htons(ETH_P_IPV6);

	skb_put(skb, sizeof(*eth));

net/bridge/br_private.h

+2 −2
Original line number Diff line number Diff line
@@ -46,12 +46,12 @@ typedef __u16 port_id; 
struct bridge_id

{

	unsigned char	prio[2];

	unsigned char	addr[6];

	unsigned char	addr[ETH_ALEN];

};



struct mac_addr

{

	unsigned char	addr[6];

	unsigned char	addr[ETH_ALEN];

};



struct br_ip