summaryrefslogtreecommitdiff
path: root/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2017-12-30 14:22:36 +0000
committerJohn Crispin <john@phrozen.org>2018-01-02 07:14:09 +0100
commit4b275baf91b7217252922cc827feb42b939c385d (patch)
treeec5845dd1f2ec31c4a52b1e8455cc1b775545f1e /target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
parent7c0a2bc93077f52c033e406864b34af3a4fab245 (diff)
downloadmtk-20170518-4b275baf91b7217252922cc827feb42b939c385d.zip
mtk-20170518-4b275baf91b7217252922cc827feb42b939c385d.tar.gz
mtk-20170518-4b275baf91b7217252922cc827feb42b939c385d.tar.bz2
kernel: bump 4.9 to 4.9.73
Refresh patches. Runtime tested: ar71xx - Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch')
-rw-r--r--target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
index 3f77895..cb4cebe 100644
--- a/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
+++ b/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3179,6 +3179,12 @@ static int mvneta_mac_link_state(struct
+@@ -3183,6 +3183,12 @@ static int mvneta_mac_link_state(struct
state->link = !!(gmac_stat & MVNETA_GMAC_LINK_UP);
state->duplex = !!(gmac_stat & MVNETA_GMAC_FULL_DUPLEX);
@@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
return 1;
}
-@@ -3221,6 +3227,8 @@ static void mvneta_mac_config(struct net
+@@ -3225,6 +3231,8 @@ static void mvneta_mac_config(struct net
if (phylink_test(state->advertising, Pause))
new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL;
@@ -33,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
switch (mode) {
case MLO_AN_SGMII:
-@@ -3245,7 +3253,7 @@ static void mvneta_mac_config(struct net
+@@ -3249,7 +3257,7 @@ static void mvneta_mac_config(struct net
/* The MAC only supports FD mode */
MVNETA_GMAC_CONFIG_FULL_DUPLEX;
@@ -42,7 +42,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;
break;
-@@ -3711,6 +3719,22 @@ static int mvneta_ethtool_set_ringparam(
+@@ -3715,6 +3723,22 @@ static int mvneta_ethtool_set_ringparam(
return 0;
}
@@ -65,7 +65,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
u8 *data)
{
-@@ -3902,6 +3926,8 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3906,6 +3930,8 @@ const struct ethtool_ops mvneta_eth_tool
.get_drvinfo = mvneta_ethtool_get_drvinfo,
.get_ringparam = mvneta_ethtool_get_ringparam,
.set_ringparam = mvneta_ethtool_set_ringparam,