From e7bf57f8bed671b9c8df540f4468f9577d211363 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sun, 13 May 2012 08:44:18 +0000
Subject: [PATCH] --- yaml --- r: 300241 b: refs/heads/master c:
 8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b h: refs/heads/master i:   300239:
 ee3c482b04437ac754d1a393dbabd906f297f732 v: v3

---
 [refs]                           | 2 +-
 trunk/net/openvswitch/datapath.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;