From 55ae52edd91f16e3d7fd2bb2bc2b6a7b51e775a7 Mon Sep 17 00:00:00 2001
From: stephen hemminger <stephen@networkplumber.org>
Date: Mon, 17 Jun 2013 12:09:59 -0700
Subject: [PATCH] --- yaml --- r: 377374 b: refs/heads/master c:
 7aa27238417a34ec9be2d8eff05ceff319f2d39b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/vxlan.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1206fcf71cd5..8ed0e61339ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a41ae604381c5cc0caf1c3261ca6b298b5fe69
+refs/heads/master: 7aa27238417a34ec9be2d8eff05ceff319f2d39b
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index 15a73ec42c64..dda997a0102c 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -1161,9 +1161,11 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 		struct sk_buff *skb1;
 
 		skb1 = skb_clone(skb, GFP_ATOMIC);
-		rc1 = vxlan_xmit_one(skb1, dev, rdst, did_rsc);
-		if (rc == NETDEV_TX_OK)
-			rc = rc1;
+		if (skb1) {
+			rc1 = vxlan_xmit_one(skb1, dev, rdst, did_rsc);
+			if (rc == NETDEV_TX_OK)
+				rc = rc1;
+		}
 	}
 
 	rc1 = vxlan_xmit_one(skb, dev, rdst0, did_rsc);