Commit 7d42e84e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

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



'skb_push()'/'skb_postpush_rcsum()' can be replaced by an equivalent
'skb_push_rcsum()' which is less verbose.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd77ce93

net/openvswitch/conntrack.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}
@@ -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;

net/openvswitch/vport-netdev.c

+3 −4
Original line number Diff line number Diff line
@@ -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: