From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753278AbeCaSeM (ORCPT ); Sat, 31 Mar 2018 14:34:12 -0400 Received: from smtprelay0208.hostedemail.com ([216.40.44.208]:45816 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753017AbeCaSeL (ORCPT ); Sat, 31 Mar 2018 14:34:11 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::::,RULES_HIT:41:355:379:541:800:960:968:973:988:989:1260:1345:1359:1437:1534:1542:1711:1730:1747:1777:1792:2393:2559:2562:2902:3138:3139:3140:3141:3142:3353:3865:3867:3870:3871:3872:4321:4605:5007:6261:7875:7903:10004:10848:11026:11232:11473:11658:11914:12043:12048:12296:12438:12555:12679:12895:14181:14394:14721:21080:21433:21451:21611:21627:30003:30054:30070,0,RBL:47.151.150.235:@perches.com:.lbl8.mailshell.net-62.8.0.100 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:19,LUA_SUMMARY:none X-HE-Tag: cup68_2432f71549722 X-Filterd-Recvd-Size: 3384 From: Joe Perches To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Stephen Hemminger Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org Subject: [PATCH V2] treewide/net: Rename eth_stp_addr to ether_stp_addr Date: Sat, 31 Mar 2018 11:34:06 -0700 Message-Id: <5f5dafaeacbc9e9aa2d969701e510d31ef6e97db.1522521099.git.joe@perches.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180331173643.GD7460@lunn.ch> References: <20180331173643.GD7460@lunn.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org eth_stp_addr is not in the same form as the other global ether__addr addresses like ether_broadcast_addr. Convert it treewide. Miscellanea: o Add comment to the ether_stp_addr define to show it's for spanning-tree Signed-off-by: Joe Perches --- V2: Remove gg from initial comment (bad editing) drivers/net/dsa/lan9303-core.c | 4 ++-- include/linux/etherdevice.h | 3 ++- net/bridge/br_device.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index fefa454f3e56..a6f015ef251a 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -789,7 +789,7 @@ static int lan9303_separate_ports(struct lan9303 *chip) { int ret; - lan9303_alr_del_port(chip, eth_stp_addr, 0); + lan9303_alr_del_port(chip, ether_stp_addr, 0); ret = lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_MIRROR, LAN9303_SWE_PORT_MIRROR_SNIFFER_PORT0 | LAN9303_SWE_PORT_MIRROR_MIRRORED_PORT1 | @@ -814,7 +814,7 @@ static void lan9303_bridge_ports(struct lan9303 *chip) lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_STATE, chip->swe_port_state); - lan9303_alr_add_port(chip, eth_stp_addr, 0, true); + lan9303_alr_add_port(chip, ether_stp_addr, 0, true); } static void lan9303_handle_reset(struct lan9303 *chip) diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 85d2486b2959..142da8043b24 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -70,7 +70,8 @@ extern const u8 ether_zero_addr[ETH_ALEN]; /* all zeros */ /* Reserved Ethernet Addresses per IEEE 802.1Q */ extern const u8 ether_reserved_addr_base[ETH_ALEN]; -#define eth_stp_addr ether_reserved_addr_base +/* Ethernet bridge - spanning tree protocol */ +#define ether_stp_addr ether_reserved_addr_base /** * is_link_local_ether_addr - Determine if given Ethernet address is link-local diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 278fc999d355..17b1917b6ecd 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -431,7 +431,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_stp_addr); + ether_addr_copy(br->group_addr, ether_stp_addr); br->stp_enabled = BR_NO_STP; br->group_fwd_mask = BR_GROUPFWD_DEFAULT; -- 2.15.0