diff options
| author |   John Hurley <john.hurley@netronome.com> | 2019-07-07 15:01:56 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-08 19:50:13 -0700 |
| commit | d27cf5c59a12f66425df29cd81f61aa73ef14ac1 (patch) | |
| tree | 200e7e737082e2e2a129789edc00cddaab20aea8 /net/openvswitch | |
| parent | net: core: move pop MPLS functionality from OvS to core helper (diff) | |
| download | wireguard-linux-d27cf5c59a12f66425df29cd81f61aa73ef14ac1.tar.xz wireguard-linux-d27cf5c59a12f66425df29cd81f61aa73ef14ac1.zip | |
net: core: add MPLS update core helper and use in OvS
Open vSwitch allows the updating of an existing MPLS header on a packet.
In preparation for supporting similar functionality in TC, move this to a
common skb helper function.
Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/actions.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 62715bb8d611..3572e11b6f21 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -193,19 +193,12 @@ static int set_mpls(struct sk_buff *skb, struct sw_flow_key *flow_key, __be32 lse; int err; - err = skb_ensure_writable(skb, skb->mac_len + MPLS_HLEN); - if (unlikely(err)) - return err; - stack = mpls_hdr(skb); lse = OVS_MASKED(stack->label_stack_entry, *mpls_lse, *mask); - if (skb->ip_summed == CHECKSUM_COMPLETE) { - __be32 diff[] = { ~(stack->label_stack_entry), lse }; - - skb->csum = csum_partial((char *)diff, sizeof(diff), skb->csum); - } + err = skb_mpls_update_lse(skb, lse); + if (err) + return err; - stack->label_stack_entry = lse; flow_key->mpls.top_lse = lse; return 0; } |