aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-05-30 21:39:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-06-02 15:13:12 +0200
commit2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch)
treeb6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
parent6e47c22268d5c89971950052aceda03810c88c75 (diff)
downloadupstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip
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/031-mvneta-implement-ethtool-autonegotiation-control.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
index 3154d7cfbe..2037a139c4 100644
--- a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
+++ b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
};
-@@ -977,6 +977,44 @@ static void mvneta_set_other_mcast_table
+@@ -978,6 +978,44 @@ static void mvneta_set_other_mcast_table
mvreg_write(pp, MVNETA_DA_FILT_OTH_MCAST + offset, val);
}
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* This method sets defaults to the NETA port:
* Clears interrupt Cause and Mask registers.
* Clears all MAC tables.
-@@ -1062,39 +1100,7 @@ static void mvneta_defaults_set(struct m
+@@ -1063,39 +1101,7 @@ static void mvneta_defaults_set(struct m
val &= ~MVNETA_PHY_POLLING_ENABLE;
mvreg_write(pp, MVNETA_UNIT_CONTROL, val);
@@ -118,7 +118,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_set_ucast_table(pp, -1);
mvneta_set_special_mcast_table(pp, -1);
mvneta_set_other_mcast_table(pp, -1);
-@@ -2958,10 +2964,43 @@ int mvneta_ethtool_get_settings(struct n
+@@ -2959,10 +2965,43 @@ int mvneta_ethtool_get_settings(struct n
int mvneta_ethtool_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct mvneta_port *pp = netdev_priv(dev);