Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 16:20:49 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 16:20:49 +0200
commit017d54c87ba197f147470df44106c3344fb065d6 (patch)
treea3382583c179608b4e3337c4ce5707b18d41d90a
parent65242c8a9e12c0456b24970402cd2e765c4c6d6d (diff)
team: Always enable vlan tx offload (bsc#1051510).
-rw-r--r--patches.fixes/team-Always-enable-vlan-tx-offload.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/team-Always-enable-vlan-tx-offload.patch b/patches.fixes/team-Always-enable-vlan-tx-offload.patch
new file mode 100644
index 0000000000..ba181672bf
--- /dev/null
+++ b/patches.fixes/team-Always-enable-vlan-tx-offload.patch
@@ -0,0 +1,37 @@
+From ee4297420d56a0033a8593e80b33fcc93fda8509 Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Thu, 27 Jun 2019 00:03:39 +0800
+Subject: [PATCH] team: Always enable vlan tx offload
+Git-commit: ee4297420d56a0033a8593e80b33fcc93fda8509
+Patch-mainline: v5.2-rc7
+References: bsc#1051510
+
+We should rather have vlan_tci filled all the way down
+to the transmitting netdevice and let it do the hw/sw
+vlan implementation.
+
+Suggested-by: Jiri Pirko <jiri@resnulli.us>
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/net/team/team.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/team/team.c
++++ b/drivers/net/team/team.c
+@@ -2137,12 +2137,12 @@ static void team_setup(struct net_device
+ dev->features |= NETIF_F_NETNS_LOCAL;
+
+ dev->hw_features = TEAM_VLAN_FEATURES |
+- NETIF_F_HW_VLAN_CTAG_TX |
+ NETIF_F_HW_VLAN_CTAG_RX |
+ NETIF_F_HW_VLAN_CTAG_FILTER;
+
+ dev->hw_features |= NETIF_F_GSO_ENCAP_ALL;
+ dev->features |= dev->hw_features;
++ dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;
+ }
+
+ static int team_newlink(struct net *src_net, struct net_device *dev,
diff --git a/series.conf b/series.conf
index cfb7ff2fa1..96751333d4 100644
--- a/series.conf
+++ b/series.conf
@@ -22798,6 +22798,7 @@
patches.fixes/net-packet-fix-memory-leak-in-packet_set_ring.patch
patches.drivers/qmi_wwan-Fix-out-of-bounds-read.patch
patches.suse/ipv4-Use-return-value-of-inet_iif-for-__raw_v4_looku.patch
+ patches.fixes/team-Always-enable-vlan-tx-offload.patch
patches.fixes/scsi-vmw_pscsi-Fix-use-after-free-in-pvscsi_queue_lc.patch
patches.fixes/Bluetooth-Fix-faulty-expression-for-minimum-encrypti.patch
patches.suse/ftrace-x86-remove-possible-deadlock-between-register_kprobe-and-ftrace_run_update_code.patch