| Message ID | 20201030183315.GA6736@earth.li |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: dsa: qca8k: Fix port MTU setting | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/cover_letter | success | Link |
| jkicinski/fixes_present | success | Link |
| jkicinski/patch_count | success | Link |
| jkicinski/tree_selection | success | Clearly marked for net |
| jkicinski/subject_prefix | success | Link |
| jkicinski/source_inline | success | Was 0 now: 0 |
| jkicinski/verify_signedoff | success | Link |
| jkicinski/module_param | success | Was 0 now: 0 |
| jkicinski/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/verify_fixes | success | Link |
| jkicinski/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
| jkicinski/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/header_inline | success | Link |
| jkicinski/stable | fail | Stable CC detected: Cc: stable@vger.kernel.org |
On Fri, Oct 30, 2020 at 06:33:15PM +0000, Jonathan McDowell wrote: > The qca8k only supports a switch-wide MTU setting, and the code to take > the max of all ports was only looking at the port currently being set. > Fix to examine all ports. > > Reported-by: DENG Qingfang <dqfext@gmail.com> > Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") > Cc: stable@vger.kernel.org > Signed-off-by: Jonathan McDowell <noodles@earth.li> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Fri, 30 Oct 2020 19:47:33 +0100 Andrew Lunn wrote: > On Fri, Oct 30, 2020 at 06:33:15PM +0000, Jonathan McDowell wrote: > > The qca8k only supports a switch-wide MTU setting, and the code to take > > the max of all ports was only looking at the port currently being set. > > Fix to examine all ports. > > > > Reported-by: DENG Qingfang <dqfext@gmail.com> > > Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") > > Cc: stable@vger.kernel.org > > Signed-off-by: Jonathan McDowell <noodles@earth.li> > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> Applied, thanks!
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 53064e0e1618..5bdac669a339 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1219,8 +1219,8 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) priv->port_mtu[port] = new_mtu; for (i = 0; i < QCA8K_NUM_PORTS; i++) - if (priv->port_mtu[port] > mtu) - mtu = priv->port_mtu[port]; + if (priv->port_mtu[i] > mtu) + mtu = priv->port_mtu[i]; /* Include L2 header / FCS length */ qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN);
The qca8k only supports a switch-wide MTU setting, and the code to take the max of all ports was only looking at the port currently being set. Fix to examine all ports. Reported-by: DENG Qingfang <dqfext@gmail.com> Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") Cc: stable@vger.kernel.org Signed-off-by: Jonathan McDowell <noodles@earth.li> --- drivers/net/dsa/qca8k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)