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

Commit 05428729 authored by Egil Hjelmeland's avatar Egil Hjelmeland Committed by David S. Miller
Browse files

net: Define eth_stp_addr in linux/etherdevice.h 



The lan9303 driver defines eth_stp_addr as a synonym to
eth_reserved_addr_base to get the STP ethernet address 01:80:c2:00:00:00.

eth_reserved_addr_base is also used to define the start of Bridge Reserved
ethernet address range, which happen to be the STP address.

br_dev_setup refer to eth_reserved_addr_base as a definition of STP
address.

Clean up by:
 - Move the eth_stp_addr definition to linux/etherdevice.h
 - Use eth_stp_addr instead of eth_reserved_addr_base in br_dev_setup.

Signed-off-by: default avatarEgil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25c5f715

include/linux/dsa/lan9303.h

+0 −2
Original line number Diff line number Diff line
@@ -34,5 +34,3 @@ struct lan9303 { 
	 **/

	struct lan9303_alr_cache_entry alr_cache[LAN9303_NUM_ALR_RECORDS];

};
 


#define eth_stp_addr eth_reserved_addr_base

include/linux/etherdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ int eth_gro_complete(struct sk_buff *skb, int nhoff); 
/* Reserved Ethernet Addresses per IEEE 802.1Q */

static const u8 eth_reserved_addr_base[ETH_ALEN] __aligned(2) =

{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };

#define eth_stp_addr eth_reserved_addr_base



/**

 * is_link_local_ether_addr - Determine if given Ethernet address is link-local

net/bridge/br_device.c

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

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



	ether_addr_copy(br->group_addr, eth_reserved_addr_base);

	ether_addr_copy(br->group_addr, eth_stp_addr);



	br->stp_enabled = BR_NO_STP;

	br->group_fwd_mask = BR_GROUPFWD_DEFAULT;