kernel/drivers/net/phy/phylink.c, branch linux-4.16.y

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-01-09T15:37:00Z

phylink: mark expected switch fall-throughs in phylink_mii_ioctl

2018-01-08T19:21:58Z

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Addresses-Coverity-ID: 1463447 ("Missing break in switch") Signed-off-by: Gustavo A. R. Silva Signed-off-by: David S. Miller

phylink: remove 'mode' variable from phylink_sfp_module_insert()

2018-01-03T02:45:32Z

'mode' is actually constant through phylink_sfp_module_insert(), so remove it and replace it with the enumerated constant. Signed-off-by: Russell King Signed-off-by: David S. Miller

phylink: ensure we report link down when LOS asserted

2018-01-02T18:39:11Z

Although we disable the netdev carrier, we fail to report in the kernel log that the link went down. Fix this. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Russell King Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-29T20:42:26Z

net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller

phylink: ensure AN is enabled

2017-12-26T02:47:20Z

Ensure that we mark AN as enabled at boot time, rather than leaving it disabled. This is noticable if your SFP module is fiber, and it supports faster speeds than 1G with 2.5G support in place. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Russell King Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller

phylink: ensure the PHY interface mode is appropriately set

2017-12-26T02:47:19Z

When setting the ethtool settings, ensure that the validated PHY interface mode is propagated to the current link settings, so that 2500BaseX can be selected. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Russell King Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller

phylink: avoid attaching more than one PHY

2017-12-21T20:03:10Z

Attaching more than one PHY to phylink is bad news, as we store a pointer to the PHY in a single location. Error out if more than one PHY is attempted to be attached. Signed-off-by: Russell King Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller

phylink: fix locking asserts

2017-12-18T19:57:48Z

Use ASSERT_RTNL() rather than WARN_ON(!lockdep_rtnl_is_held()) which stops working when lockdep fires, and we end up with lots of warnings. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Russell King Signed-off-by: David S. Miller

net: phy: phylink: Handle NULL fwnode_handle

2017-12-15T18:50:49Z

Unlike the various of_* routines to fetch properties, fwnode_* routines can have an early check against a NULL fwnode_handle reference which makes them return -EINVAL (see fwnode_call_int_op), thus making it virtually impossible to differentiate what type of error is going on. Have an early check in phylink_register_sfp() so we can keep proceeding with the initialization, there is not much we can do without a valid fwnode_handle except return early and treat this similarly to -ENOENT. Fixes: 8fa7b9b6af25 ("phylink: convert to fwnode") Signed-off-by: Florian Fainelli Acked-by: Russell King Signed-off-by: David S. Miller