From: Greg Kroah-Hartman Date: Fri, 23 Nov 2018 07:16:03 +0000 (+0100) Subject: drop ibmvnic-fix-accelerated-vlan-handling.patch from 4.9 X-Git-Tag: v4.19.4~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a321471526832199052872b2e7653bedc4462a9;p=thirdparty%2Fkernel%2Fstable-queue.git drop ibmvnic-fix-accelerated-vlan-handling.patch from 4.9 --- diff --git a/queue-4.9/ibmvnic-fix-accelerated-vlan-handling.patch b/queue-4.9/ibmvnic-fix-accelerated-vlan-handling.patch deleted file mode 100644 index 82e51bc3f61..00000000000 --- a/queue-4.9/ibmvnic-fix-accelerated-vlan-handling.patch +++ /dev/null @@ -1,29 +0,0 @@ -From foo@baz Wed Nov 21 13:17:56 CET 2018 -From: "Michał Mirosław" -Date: Wed, 7 Nov 2018 17:50:52 +0100 -Subject: ibmvnic: fix accelerated VLAN handling - -From: "Michał Mirosław" - -[ Upstream commit e84b47941e15e6666afb8ee8b21d1c3fc1a013af ] - -Don't request tag insertion when it isn't present in outgoing skb. - -Signed-off-by: Michał Mirosław -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/ibm/ibmvnic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/ibm/ibmvnic.c -+++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -786,7 +786,7 @@ static int ibmvnic_xmit(struct sk_buff * - tx_crq.v1.sge_len = cpu_to_be32(skb->len); - tx_crq.v1.ioba = cpu_to_be64(data_dma_addr); - -- if (adapter->vlan_header_insertion) { -+ if (adapter->vlan_header_insertion && skb_vlan_tag_present(skb)) { - tx_crq.v1.flags2 |= IBMVNIC_TX_VLAN_INSERT; - tx_crq.v1.vlan_id = cpu_to_be16(skb->vlan_tci); - } diff --git a/queue-4.9/series b/queue-4.9/series index 407269f574f..a8458fc8c01 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,5 +1,4 @@ flow_dissector-do-not-dissect-l4-ports-for-fragments.patch -ibmvnic-fix-accelerated-vlan-handling.patch ip_tunnel-don-t-force-df-when-mtu-is-locked.patch net-gro-reset-skb-pkt_type-in-napi_reuse_skb.patch sctp-not-allow-to-set-asoc-prsctp_enable-by-sockopt.patch