Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit cbe7e76d94f59e89302bd514e4b685e03d1ebbe4

Authored by Pravin B Shelar
Committed by David S. Miller
1 parent ec449f40bb
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

openvswitch: Fix GSO with multiple MPLS label. 

MPLS GSO needs to know inner most protocol to process GSO packets.

Fixes: 25cd9ba0abc ("openvswitch: Add basic MPLS support to
kernel").

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

net/openvswitch/actions.c
Diff comments   View file @ cbe7e76
... ... @@ -147,7 +147,8 @@
147 147 hdr = eth_hdr(skb);
148 148 hdr->h_proto = mpls->mpls_ethertype;
149 149  
150   - skb_set_inner_protocol(skb, skb->protocol);
  150 + if (!skb->inner_protocol)
  151 + skb_set_inner_protocol(skb, skb->protocol);
151 152 skb->protocol = mpls->mpls_ethertype;
152 153  
153 154 invalidate_flow_key(key);