From: Stephen Hemminger <shemminger@vyatta.com>
To: Andrei Warkentin <andreiw@motorola.com>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCHv3] Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.
Date: Thu, 4 Aug 2011 21:36:05 -0700 [thread overview]
Message-ID: <20110804213605.31be6131@nehalam.ftrdhcpuser.net> (raw)
In-Reply-To: <1312510625-26596-2-git-send-email-andreiw@motorola.com>
On Thu, 4 Aug 2011 21:17:05 -0500
Andrei Warkentin <andreiw@motorola.com> wrote:
Half ok, half not.
> diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
> index cf09fe5..ef18070 100644
> --- a/net/bridge/br_device.c
> +++ b/net/bridge/br_device.c
> @@ -162,6 +162,7 @@ static int br_set_mac_address(struct net_device *dev, void *p)
> br->flags |= BR_SET_MAC_ADDR;
> spin_unlock_bh(&br->lock);
>
> + call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
> return 0;
> }
This is unnecessary since already done by dev_set_mac_address.
> @@ -492,10 +493,13 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
> del_nbp(p);
>
> spin_lock_bh(&br->lock);
> - br_stp_recalculate_bridge_id(br);
> + changed_addr = br_stp_recalculate_bridge_id(br);
> br_features_recompute(br);
> spin_unlock_bh(&br->lock);
>
> + if (changed_addr)
> + call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);
> +
> return 0;
> }
>
Good, I forgot that case.
> diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
> index 404d4e1..651eac3 100644
> --- a/net/bridge/br_notify.c
> +++ b/net/bridge/br_notify.c
> @@ -34,6 +34,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
> struct net_device *dev = ptr;
> struct net_bridge_port *p = br_port_get(dev);
> struct net_bridge *br;
> + bool changed_addr;
> int err;
>
> /* not a port of a bridge */
> @@ -51,8 +52,11 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
> case NETDEV_CHANGEADDR:
> spin_lock_bh(&br->lock);
> br_fdb_changeaddr(p, dev->dev_addr);
> - br_stp_recalculate_bridge_id(br);
> + changed_addr = br_stp_recalculate_bridge_id(br);
> spin_unlock_bh(&br->lock);
> +
> + if (changed_addr)
> + call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);
> break;
>
> case NETDEV_CHANGE:
This is also fine.
> iff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
> index c0990ba..4528e9a 100644
> --- a/net/bridge/br_stp_if.c
> +++ b/net/bridge/br_stp_if.c
> @@ -213,7 +213,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
>
> /* user has chosen a value so keep it */
> if (br->flags & BR_SET_MAC_ADDR)
> - return;
> + return false;
>
> list_for_each_entry(p, &br->port_list, list) {
> if (addr == br_mac_zero ||
This is already in net-next.
next prev parent reply other threads:[~2011-08-05 4:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-05 1:55 Fix bridge MAC change notification Andrei Warkentin
2011-08-05 1:55 ` [PATCH] Bridge: Always send NETDEV_CHANGEADDR up on br MAC change Andrei Warkentin
2011-08-05 2:11 ` Always send NETDEV_CHANGEADDR up Andrei Warkentin
2011-08-05 2:11 ` [PATCHv2] Bridge: Always send NETDEV_CHANGEADDR up on br MAC change Andrei Warkentin
2011-08-05 2:17 ` Always send NETDEV_CHANGEADDR up Andrei Warkentin
2011-08-05 2:17 ` [PATCHv3] Bridge: Always send NETDEV_CHANGEADDR up on br MAC change Andrei Warkentin
2011-08-05 4:36 ` Stephen Hemminger [this message]
2011-08-05 6:13 ` Andrei Warkentin
2011-08-05 21:04 ` Always send NETDEV_CHANGEADDR up Andrei Warkentin
2011-08-05 21:04 ` [PATCHv4] Bridge: Always send NETDEV_CHANGEADDR up on br MAC change Andrei Warkentin
2011-08-08 20:12 ` Stephen Hemminger
2011-08-09 5:12 ` Andrei Warkentin
2011-08-10 4:45 ` David Miller
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=20110804213605.31be6131@nehalam.ftrdhcpuser.net \
--to=shemminger@vyatta.com \
--cc=andreiw@motorola.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.