From e615f03a39098c87ab0f22bb1b0332ec71d125f2 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Tue, 9 May 2006 23:14:35 -0700
Subject: [PATCH] --- yaml --- r: 26640 b: refs/heads/master c:
 a50bb7b9af9a7c39b2aba15678eb686ae428718c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 36d9171a6f61..7bb033e82975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c1056839e808aad728db86d739ffec71d2d1db8
+refs/heads/master: a50bb7b9af9a7c39b2aba15678eb686ae428718c
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index beeb612be98f..2bd9592b75cd 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -8454,6 +8454,9 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
 
 	tx_len = 1514;
 	skb = dev_alloc_skb(tx_len);
+	if (!skb)
+		return -ENOMEM;
+
 	tx_data = skb_put(skb, tx_len);
 	memcpy(tx_data, tp->dev->dev_addr, 6);
 	memset(tx_data + 6, 0x0, 8);