Merge "master" into "wdp".

[sliver-openvswitch.git] / datapath / vport-netdev.c

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index d5de215..7bf56f5 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -59,8 +59,7 @@ static int netdev_init(void)
        return 0;
 }
 
-static void
-netdev_exit(void)
+static void netdev_exit(void)
 {
        br_handle_frame_hook = NULL;
 }
@@ -224,8 +223,7 @@ unsigned char netdev_get_operstate(const struct vport *vport)
        return netdev_vport->dev->operstate;
 }
 
-int
-netdev_get_ifindex(const struct vport *vport)
+int netdev_get_ifindex(const struct vport *vport)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
        return netdev_vport->dev->ifindex;
@@ -253,9 +251,11 @@ static void netdev_port_receive(struct net_bridge_port *p, struct sk_buff *skb)
         * (No one comes after us, since we tell handle_bridge() that we took
         * the packet.) */
        skb = skb_share_check(skb, GFP_ATOMIC);
-       if (!skb)
+       if (unlikely(!skb))
                return;
 
+       skb_warn_if_lro(skb);
+
        /* Push the Ethernet header back on. */
        skb_push(skb, ETH_HLEN);
        skb_reset_mac_header(skb);