From: Andrew Lunn <andrew@lunn.ch>
To: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@savoirfairelinux.com,
"David S. Miller" <davem@davemloft.net>,
Kevin Smith <kevin.smith@elecsyscorp.com>
Subject: Re: [PATCH net-next] net: dsa: mv88e6xxx: avoid writing the same mode
Date: Tue, 8 Mar 2016 15:37:21 +0100 [thread overview]
Message-ID: <20160308143721.GG351@lunn.ch> (raw)
In-Reply-To: <1457393092-22826-1-git-send-email-vivien.didelot@savoirfairelinux.com>
On Mon, Mar 07, 2016 at 06:24:52PM -0500, Vivien Didelot wrote:
> There is no need to change the 802.1Q port mode for the same value.
> Thus avoid such message:
>
> [ 401.954836] dsa dsa@0 lan0: 802.1Q Mode: Disabled (was Disabled)
>
> Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
> ---
> drivers/net/dsa/mv88e6xxx.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
> index 1aee42d..5f07524 100644
> --- a/drivers/net/dsa/mv88e6xxx.c
> +++ b/drivers/net/dsa/mv88e6xxx.c
> @@ -1765,16 +1765,21 @@ int mv88e6xxx_port_vlan_filtering(struct dsa_switch *ds, int port,
>
> old = ret & PORT_CONTROL_2_8021Q_MASK;
>
> - ret &= ~PORT_CONTROL_2_8021Q_MASK;
> - ret |= new & PORT_CONTROL_2_8021Q_MASK;
> + if (new != old) {
> + ret &= ~PORT_CONTROL_2_8021Q_MASK;
> + ret |= new & PORT_CONTROL_2_8021Q_MASK;
>
> - ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_CONTROL_2, ret);
> - if (ret < 0)
> - goto unlock;
> + ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_CONTROL_2,
> + ret);
> + if (ret < 0)
> + goto unlock;
> +
> + netdev_dbg(ds->ports[port], "802.1Q Mode %s (was %s)\n",
> + mv88e6xxx_port_8021q_mode_names[new],
> + mv88e6xxx_port_8021q_mode_names[old]);
> + }
>
> - netdev_dbg(ds->ports[port], "802.1Q Mode: %s (was %s)\n",
> - mv88e6xxx_port_8021q_mode_names[new],
> - mv88e6xxx_port_8021q_mode_names[old]);
> + ret = 0;
> unlock:
> mutex_unlock(&ps->smi_mutex);
>
> --
> 2.7.2
>
next prev parent reply other threads:[~2016-03-08 14:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 23:24 [PATCH net-next] net: dsa: mv88e6xxx: avoid writing the same mode Vivien Didelot
2016-03-08 14:37 ` Andrew Lunn [this message]
2016-03-10 21:11 ` 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=20160308143721.GG351@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=kernel@savoirfairelinux.com \
--cc=kevin.smith@elecsyscorp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).