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

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
...@@ -367,7 +367,7 @@ void br_dev_setup(struct net_device *dev) ...@@ -367,7 +367,7 @@ void br_dev_setup(struct net_device *dev)
br->bridge_id.prio[0] = 0x80; br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00; 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->stp_enabled = BR_NO_STP;
br->group_fwd_mask = BR_GROUPFWD_DEFAULT; br->group_fwd_mask = BR_GROUPFWD_DEFAULT;
......
...@@ -363,7 +363,7 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br, ...@@ -363,7 +363,7 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
eth = eth_hdr(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[0] = 1;
eth->h_dest[1] = 0; eth->h_dest[1] = 0;
eth->h_dest[2] = 0x5e; eth->h_dest[2] = 0x5e;
...@@ -433,7 +433,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, ...@@ -433,7 +433,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
eth = eth_hdr(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); eth->h_proto = htons(ETH_P_IPV6);
skb_put(skb, sizeof(*eth)); skb_put(skb, sizeof(*eth));
......
...@@ -46,12 +46,12 @@ typedef __u16 port_id; ...@@ -46,12 +46,12 @@ typedef __u16 port_id;
struct bridge_id struct bridge_id
{ {
unsigned char prio[2]; unsigned char prio[2];
unsigned char addr[6]; unsigned char addr[ETH_ALEN];
}; };
struct mac_addr struct mac_addr
{ {
unsigned char addr[6]; unsigned char addr[ETH_ALEN];
}; };
struct br_ip struct br_ip
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment