diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-28 10:08:59 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-10-08 16:31:58 +0300 |
| commit | 239dff6697b56f9589dd83bc0268635cc32c188c (patch) | |
| tree | 4788b9cc047ce55625116bd8987c1db6025dd115 /target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch | |
| parent | 9aeb7ce8dc53dc4a83f05b5bb707cb79e7959f66 (diff) | |
| download | upstream-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/422-net-mvneta-add-nway_reset-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch b/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch index c7725b3590..9a604eb03a 100644 --- a/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch +++ b/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.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 -@@ -3616,6 +3616,13 @@ mvneta_ethtool_get_link_ksettings(struct +@@ -3614,6 +3614,13 @@ mvneta_ethtool_get_link_ksettings(struct return phylink_ethtool_ksettings_get(pp->phylink, cmd); } @@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Set interrupt coalescing for ethtools */ static int mvneta_ethtool_set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) -@@ -3889,6 +3896,7 @@ static const struct net_device_ops mvnet +@@ -3887,6 +3894,7 @@ static const struct net_device_ops mvnet }; const struct ethtool_ops mvneta_eth_tool_ops = { |