diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 |
| commit | e51a08b8df461919451b1a2bf4a730da0b994425 (patch) | |
| tree | f3db0334e66ecad72af35d47efac4f1a24edb736 /net/mpls/mpls_gso.c | |
| parent | ceb8d5bf17d366534f32d2f60f41d905a5bc864b (diff) | |
| parent | 74f47278cb056ffe1d261df3e094d608c3569829 (diff) | |
| download | op-kernel-dev-e51a08b8df461919451b1a2bf4a730da0b994425.zip op-kernel-dev-e51a08b8df461919451b1a2bf4a730da0b994425.tar.gz | |
Merge branch 'openvswitch-net'
Pravin B Shelar says:
====================
openvswitch: datapath fixes
Following patch series is mostly targeted to MPLS fixes. other
patches are related datapth transmit path error handling.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/mpls_gso.c')
| -rw-r--r-- | net/mpls/mpls_gso.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c index ca27837..349295d 100644 --- a/net/mpls/mpls_gso.c +++ b/net/mpls/mpls_gso.c @@ -31,10 +31,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb, SKB_GSO_TCPV6 | SKB_GSO_UDP | SKB_GSO_DODGY | - SKB_GSO_TCP_ECN | - SKB_GSO_GRE | - SKB_GSO_GRE_CSUM | - SKB_GSO_IPIP))) + SKB_GSO_TCP_ECN))) goto out; /* Setup inner SKB. */ |
