From: Joe Perches <joe@perches.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Stephen Hemminger <stephen@networkplumber.org>
Cc: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bridge@lists.linux-foundation.org
Subject: [PATCH 02/12] treewide/net: Rename eth_stp_addr to ether_stp_addr
Date: Sat, 31 Mar 2018 00:05:17 -0700 [thread overview]
Message-ID: <a2d52bbcdcd36c5062bd4fa175df15acd5f8cb85.1522479607.git.joe@perches.com> (raw)
In-Reply-To: <cover.1522479607.git.joe@perches.com>
eth_stp_addr is not in the same form as the other global ether_<foo>_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 <joe@perches.com>
---
drivers/net/dsa/lan9303-core.c | 4 ++--
include/linux/etherdevice.h | 3 ++-
net/bridge/br_device.c | 4 ++--
3 files changed, 6 insertions(+), 5 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..3abcf69d1976 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -1,4 +1,4 @@
-/*
+gg/*
* Device handling code
* Linux ethernet bridge
*
@@ -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
next prev parent reply other threads:[~2018-03-31 7:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-31 7:05 [PATCH 00/12] Ethernet: Add and use ether_<type>_addr globals Joe Perches
2018-03-31 7:05 ` [PATCH 01/12] ethernet: Add generic ether_<foo>_addr addresses Joe Perches
2018-03-31 7:05 ` Joe Perches [this message]
2018-03-31 17:36 ` [PATCH 02/12] treewide/net: Rename eth_stp_addr to ether_stp_addr Andrew Lunn
2018-03-31 18:01 ` Joe Perches
2018-03-31 18:34 ` [PATCH V2] " Joe Perches
2018-04-01 18:07 ` David Miller
2018-04-01 0:18 ` [PATCH 02/12] " kbuild test robot
2018-03-31 7:05 ` [PATCH 03/12] net: mac80211: Use global ether_broadcast_addr Joe Perches
2018-03-31 7:05 ` [PATCH 04/12] bridge: netfilter: Use the new global ether_<foo>_addr arrays Joe Perches
2018-03-31 18:28 ` Pablo Neira Ayuso
2018-03-31 18:40 ` Joe Perches
2018-03-31 7:05 ` [PATCH 05/12] net: atm: Use ether_broadcast_addr Joe Perches
2018-03-31 7:05 ` [PATCH 06/12] wireless: Convert simple uses of a static const Ethernet broadcast address Joe Perches
2018-03-31 14:01 ` Pkshih
2018-03-31 14:33 ` Joe Perches
2018-04-05 12:39 ` Kalle Valo
2018-04-05 12:48 ` Kalle Valo
2018-03-31 7:05 ` [PATCH 07/12] brcmfmac: Convert ALLFFMAC to ether_broadcast_addr Joe Perches
2018-04-05 19:00 ` Arend van Spriel
2018-03-31 7:05 ` [PATCH 08/12] iwlegacy: Remove EXPORT_SYMBOL(il_bcast_addr) and use ether_broadcast_addr Joe Perches
2018-03-31 7:05 ` [PATCH 09/12] iwlwifi: Remove local iwl_bcast_addr " Joe Perches
2018-07-07 7:40 ` Luciano Coelho
2018-09-07 10:46 ` Luciano Coelho
2018-03-31 7:05 ` [PATCH 10/12] mvpp2: Use ether_broadcast_addr instead of a local array Joe Perches
2018-03-31 7:05 ` [PATCH 11/12] qlogic: Convert local bcast_addr to global ether_broadcast_addr Joe Perches
2018-03-31 7:05 ` [PATCH 12/12] ethernet: Use ether_zero_addr instead of local statics Joe Perches
2018-04-05 13:27 ` [PATCH 00/12] Ethernet: Add and use ether_<type>_addr globals Felix Fietkau
2018-04-05 13:51 ` Joe Perches
2018-04-05 14:05 ` Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a2d52bbcdcd36c5062bd4fa175df15acd5f8cb85.1522479607.git.joe@perches.com \
--to=joe@perches.com \
--cc=andrew@lunn.ch \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®