aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-28 10:08:59 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-10-08 16:31:58 +0300
commit239dff6697b56f9589dd83bc0268635cc32c188c (patch)
tree4788b9cc047ce55625116bd8987c1db6025dd115 /target/linux/mvebu/patches-4.9/424-net-mvneta-add-flow-control-support-via-phylink.patch
parent9aeb7ce8dc53dc4a83f05b5bb707cb79e7959f66 (diff)
downloadupstream-239dff6697b56f9589dd83bc0268635cc32c188c.tar.gz
upstream-239dff6697b56f9589dd83bc0268635cc32c188c.tar.bz2
upstream-239dff6697b56f9589dd83bc0268635cc32c188c.zip
kernel: update and refresh patches
The lantiq patch 0028-NET-lantiq-various-etop-fixes.patch and sunxi patch 0051-stmmac-form-4-11.patch no longer applied after applying the the "generalize napi_complete_done()" patch. Update them so they apply, and refresh patches while at it. Fixes: 9aeb7ce8dc5 ("generic: net: generalize napi_complete_done") Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
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 b46359ccc8..f10b57c99a 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
-@@ -3180,6 +3180,12 @@ static int mvneta_mac_link_state(struct
+@@ -3178,6 +3178,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;
}
-@@ -3222,6 +3228,8 @@ static void mvneta_mac_config(struct net
+@@ -3220,6 +3226,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:
-@@ -3246,7 +3254,7 @@ static void mvneta_mac_config(struct net
+@@ -3244,7 +3252,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;
-@@ -3712,6 +3720,22 @@ static int mvneta_ethtool_set_ringparam(
+@@ -3710,6 +3718,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)
{
-@@ -3903,6 +3927,8 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3901,6 +3925,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,