datapath: Don't unnecessarily set skb mac header.

We currently call skb_reset_mac_header() in a few places when a
packet is received.  However, this is not needed because flow_extract()
will set all of the protocol headers during parsing and nothing needs
the packet headers before that time.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 9079295b1dbabbcfed6085758e115fb0b982ba57..6d610fdab48d8f2f1f8196b0c5c774a1d91d4d24 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -73,12 +73,10 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
        struct internal_dev *internal_dev = internal_dev_priv(netdev);
        struct vport *vport = rcu_dereference(internal_dev->vport);
 
-       skb_reset_mac_header(skb);
        compute_ip_summed(skb, true);
        OVS_CB(skb)->flow = NULL;
 
        vport_receive(vport, skb);
-
        return 0;
 }
 

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index c023c8548bd7af639cb5f19cb204cd4105aa43ad..c643696fcd2598f117bf2d1ef13ebb7322de08a5 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -264,9 +264,7 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
 
        skb_warn_if_lro(skb);
 
-       /* Push the Ethernet header back on. */
        skb_push(skb, ETH_HLEN);
-       skb_reset_mac_header(skb);
        compute_ip_summed(skb, false);
 
        vport_receive(vport, skb);