diff options
| -rw-r--r-- | datapath/vport-netdev.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c index df02c95b..4b66c1e5 100644 --- a/datapath/vport-netdev.c +++ b/datapath/vport-netdev.c @@ -249,10 +249,11 @@ int ovs_netdev_get_mtu(const struct vport *vport) /* Must be called with rcu_read_lock. */ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) { - if (unlikely(!vport)) { - kfree_skb(skb); - return; - } + if (unlikely(!vport)) + goto error; + + if (unlikely(skb_warn_if_lro(skb))) + goto error; /* Make our own copy of the packet. Otherwise we will mangle the * packet for anyone who came before us (e.g. tcpdump via AF_PACKET). @@ -264,13 +265,16 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) skb_push(skb, ETH_HLEN); - if (unlikely(compute_ip_summed(skb, false))) { - kfree_skb(skb); - return; - } + if (unlikely(compute_ip_summed(skb, false))) + goto error; + vlan_copy_skb_tci(skb); ovs_vport_receive(vport, skb); + return; + +error: + kfree_skb(skb); } static unsigned packet_length(const struct sk_buff *skb) @@ -309,9 +313,6 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) goto error; } - if (unlikely(skb_warn_if_lro(skb))) - goto error; - skb->dev = netdev_vport->dev; forward_ip_summed(skb, true); |