diff options
| author | DENG Qingfang <dengqf6@mail2.sysu.edu.cn> | 2020-03-04 20:46:28 +0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-04-13 22:41:37 +0200 |
| commit | d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157 (patch) | |
| tree | eb56f4df00a149545a37dd7404853dee47256173 /target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch | |
| parent | ae183c128fdd41a041b760f11bf2ba8c0b8a42eb (diff) | |
| download | upstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.tar.gz upstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.tar.bz2 upstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.zip | |
mvebu: refresh patches
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch index 4a5ea36144..c62839c82d 100644 --- a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch +++ b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch @@ -9,13 +9,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -4272,6 +4272,15 @@ static int mvneta_ethtool_set_eee(struct +@@ -4332,6 +4332,14 @@ static int mvneta_ethtool_set_eee(struct return phylink_ethtool_set_eee(pp->phylink, eee); } +static u16 mvneta_select_queue(struct net_device *dev, struct sk_buff *skb, -+ struct net_device *sb_dev, -+ select_queue_fallback_t fallback) ++ struct net_device *sb_dev) +{ + /* XXX: hardware queue scheduling is broken, + * use only one queue until it is fixed */ @@ -25,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static const struct net_device_ops mvneta_netdev_ops = { .ndo_open = mvneta_open, .ndo_stop = mvneta_stop, -@@ -4282,6 +4291,7 @@ static const struct net_device_ops mvnet +@@ -4342,6 +4350,7 @@ static const struct net_device_ops mvnet .ndo_fix_features = mvneta_fix_features, .ndo_get_stats64 = mvneta_get_stats64, .ndo_do_ioctl = mvneta_ioctl, |