git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Fri Mar  8 08:55:03 CET 2019
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Fri, 1 Mar 2019 19:53:57 +0100
   4 Subject: net: dsa: mv88e6xxx: handle unknown duplex modes gracefully in mv88e6xxx_port_set_duplex
   5
   6 From: Heiner Kallweit <hkallweit1@gmail.com>
   7
   8 [ Upstream commit c6195a8bdfc62a7cecf7df685e64847a4b700275 ]
   9
  10 When testing another issue I faced the problem that
  11 mv88e6xxx_port_setup_mac() failed due to DUPLEX_UNKNOWN being passed
  12 as argument to mv88e6xxx_port_set_duplex(). We should handle this case
  13 gracefully and return -EOPNOTSUPP, like e.g. mv88e6xxx_port_set_speed()
  14 is doing it.
  15
  16 Fixes: 7f1ae07b51e8 ("net: dsa: mv88e6xxx: add port duplex setter")
  17 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  18 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/net/dsa/mv88e6xxx/port.c |    2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 --- a/drivers/net/dsa/mv88e6xxx/port.c
  26 +++ b/drivers/net/dsa/mv88e6xxx/port.c
  27 @@ -165,7 +165,7 @@ int mv88e6xxx_port_set_duplex(struct mv8
  28                 /* normal duplex detection */
  29                 break;
  30         default:
  31 -               return -EINVAL;
  32 +               return -EOPNOTSUPP;
  33         }
  34
  35         err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);