Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler and one in the meson-gxl PHY driver. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -338,6 +338,7 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
|
||||
cmode = MV88E6XXX_PORT_STS_CMODE_2500BASEX;
|
||||
break;
|
||||
case PHY_INTERFACE_MODE_XGMII:
|
||||
case PHY_INTERFACE_MODE_XAUI:
|
||||
cmode = MV88E6XXX_PORT_STS_CMODE_XAUI;
|
||||
break;
|
||||
case PHY_INTERFACE_MODE_RXAUI:
|
||||
|
Reference in New Issue
Block a user