diff --git a/[refs] b/[refs] index 79bd727734eb..07c8763069d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b99215cdc6e191f5649687536d4fb0faa3d7f56e +refs/heads/master: 8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c index 777716bc80f7..e66341ec455c 100644 --- a/trunk/net/openvswitch/datapath.c +++ b/trunk/net/openvswitch/datapath.c @@ -321,7 +321,7 @@ static int queue_userspace_packet(int dp_ifindex, struct sk_buff *skb, return -ENOMEM; nskb = __vlan_put_tag(nskb, vlan_tx_tag_get(nskb)); - if (!skb) + if (!nskb) return -ENOMEM; nskb->vlan_tci = 0;