Upstream commit:
commit 880388aa3c07fdea4f9b85e35641753017b1852f
Author: David S. Miller <[email protected]>
Date: Mon Jul 3 07:29:12 2017 -0700
net: Remove all references to SKB_GSO_UDP.
Such packets are no longer possible.
Signed-off-by: David S. Miller <[email protected]>
Apply openvswitch section of this upstream patch.
Signed-off-by: Greg Rose <[email protected]>
---
datapath/flow.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/datapath/flow.c b/datapath/flow.c
index c4f63b0..9bf3eba 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -589,8 +589,7 @@ static int key_extract(struct sk_buff *skb, struct
sw_flow_key *key)
key->ip.frag = OVS_FRAG_TYPE_LATER;
return 0;
}
- if (nh->frag_off & htons(IP_MF) ||
- skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
+ if (nh->frag_off & htons(IP_MF))
key->ip.frag = OVS_FRAG_TYPE_FIRST;
else
key->ip.frag = OVS_FRAG_TYPE_NONE;
@@ -707,9 +706,6 @@ static int key_extract(struct sk_buff *skb, struct
sw_flow_key *key)
if (key->ip.frag == OVS_FRAG_TYPE_LATER)
return 0;
- if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
- key->ip.frag = OVS_FRAG_TYPE_FIRST;
-
/* Transport layer. */
if (key->ip.proto == NEXTHDR_TCP) {
if (tcphdr_ok(skb)) {
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
