diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-05-30 21:39:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-06-02 15:13:12 +0200 |
| commit | 2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch) | |
| tree | b6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch | |
| parent | 6e47c22268d5c89971950052aceda03810c88c75 (diff) | |
| download | mtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip mtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz mtk-20170518-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2 | |
kernel: bump kernel 4.4 to 4.4.135 for 17.01
* Refreshed patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch index 75cd46e..62633cf 100644 --- a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch +++ b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch @@ -14,7 +14,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 -@@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net +@@ -3209,6 +3209,8 @@ static void mvneta_mac_config(struct net if (state->advertising & ADVERTISED_Pause) new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL; @@ -23,7 +23,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> switch (mode) { case MLO_AN_SGMII: -@@ -3232,7 +3234,7 @@ static void mvneta_mac_config(struct net +@@ -3233,7 +3235,7 @@ static void mvneta_mac_config(struct net /* The MAC only supports FD mode */ MVNETA_GMAC_CONFIG_FULL_DUPLEX; @@ -32,7 +32,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN; break; -@@ -3685,6 +3687,22 @@ static int mvneta_ethtool_set_ringparam( +@@ -3686,6 +3688,22 @@ static int mvneta_ethtool_set_ringparam( return 0; } @@ -55,7 +55,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) { -@@ -3866,6 +3884,8 @@ const struct ethtool_ops mvneta_eth_tool +@@ -3867,6 +3885,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, |