diff options
| author |   Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:55 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-21 14:20:16 -0500 |
| commit | 1abcd82c20e7cbfd2b89d834b24ff68feae158ec (patch) | |
| tree | 761effa3c9f8091efcb2e4377e677ca309ad3d59 | |
| parent | l2tp_eth: allow to set a specific mac address (diff) | |
| download | linux-dev-1abcd82c20e7cbfd2b89d834b24ff68feae158ec.tar.xz linux-dev-1abcd82c20e7cbfd2b89d834b24ff68feae158ec.zip | |
openvswitch: actions: use skb_postpull_rcsum when possible
Replace duplicated code by calling skb_postpull_rcsum
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/actions.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 394efa67934e..749a30163071 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -175,10 +175,7 @@ static int pop_mpls(struct sk_buff *skb, struct sw_flow_key *key, if (unlikely(err)) return err; - if (skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_sub(skb->csum, - csum_partial(skb_mpls_header(skb), - MPLS_HLEN, 0)); + skb_postpull_rcsum(skb, skb_mpls_header(skb), MPLS_HLEN); memmove(skb_mac_header(skb) + MPLS_HLEN, skb_mac_header(skb), skb->mac_len); @@ -230,9 +227,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) if (unlikely(err)) return err; - if (skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_sub(skb->csum, csum_partial(skb->data - + (2 * ETH_ALEN), VLAN_HLEN, 0)); + skb_postpull_rcsum(skb, skb->data + (2 * ETH_ALEN), VLAN_HLEN); vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN); *current_tci = vhdr->h_vlan_TCI; |