Skip to content

Commit

Permalink
net: openvswitch: Use 'skb_push_rcsum()' instead of hand coding it
Browse files Browse the repository at this point in the history
'skb_push()'/'skb_postpush_rcsum()' can be replaced by an equivalent
'skb_push_rcsum()' which is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
tititiou36 authored and davem330 committed Apr 4, 2021
1 parent cd77ce9 commit 7d42e84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 2 additions & 4 deletions net/openvswitch/conntrack.c
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,7 @@ static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct,

err = nf_nat_packet(ct, ctinfo, hooknum, skb);
push:
skb_push(skb, nh_off);
skb_postpush_rcsum(skb, skb->data, nh_off);
skb_push_rcsum(skb, nh_off);

return err;
}
Expand Down Expand Up @@ -1322,8 +1321,7 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb,
else
err = ovs_ct_lookup(net, key, info, skb);

skb_push(skb, nh_ofs);
skb_postpush_rcsum(skb, skb->data, nh_ofs);
skb_push_rcsum(skb, nh_ofs);
if (err)
kfree_skb(skb);
return err;
Expand Down
7 changes: 3 additions & 4 deletions net/openvswitch/vport-netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ static void netdev_port_receive(struct sk_buff *skb)
if (unlikely(!skb))
return;

if (skb->dev->type == ARPHRD_ETHER) {
skb_push(skb, ETH_HLEN);
skb_postpush_rcsum(skb, skb->data, ETH_HLEN);
}
if (skb->dev->type == ARPHRD_ETHER)
skb_push_rcsum(skb, ETH_HLEN);

ovs_vport_receive(vport, skb, skb_tunnel_info(skb));
return;
error:
Expand Down

0 comments on commit 7d42e84

Please sign in to comment.