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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 71cec03e861249209c1cb3f20ca09be2f300091b..c29b0ef1fc27c57dc96c6011c1747ee7772269f9 100644 (file)
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -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;

diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index 57d6436e6f6ad44bb34c263ab9f27433d1651b73..8e1a88f136227d6ea2e954e0c911832c3b216286 100644 (file)
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -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: