moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: openvswitch: Use 'skb_push_rcsum()' instead of hand coding it

Browse Source 
'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>
This commit is contained in:
Christophe JAILLET
2021-04-04 09:11:03 +02:00
committed by David S. Miller
parent cd77ce9303
commit 7d42e84eb9
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/openvswitch/conntrack.c
View File

@@ -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); err = nf_nat_packet(ct, ctinfo, hooknum, skb);
push: push:
skb_push(skb, nh_off); skb_push_rcsum(skb, nh_off);
skb_postpush_rcsum(skb, skb->data, nh_off);
return err; return err;
} }
@@ -1322,8 +1321,7 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb,
else else
err = ovs_ct_lookup(net, key, info, skb); err = ovs_ct_lookup(net, key, info, skb);
skb_push(skb, nh_ofs); skb_push_rcsum(skb, nh_ofs);
skb_postpush_rcsum(skb, skb->data, nh_ofs);
if (err) if (err)
kfree_skb(skb); kfree_skb(skb);
return err; return err;

7
net/openvswitch/vport-netdev.c
View File

@@ -44,10 +44,9 @@ static void netdev_port_receive(struct sk_buff *skb)
if (unlikely(!skb)) if (unlikely(!skb))
return; return;
if (skb->dev->type == ARPHRD_ETHER) { if (skb->dev->type == ARPHRD_ETHER)
skb_push(skb, ETH_HLEN); skb_push_rcsum(skb, ETH_HLEN);
skb_postpush_rcsum(skb, skb->data, ETH_HLEN);
}
ovs_vport_receive(vport, skb, skb_tunnel_info(skb)); ovs_vport_receive(vport, skb, skb_tunnel_info(skb));
return; return;
error: error: