From 69f3815f0ede64b07a8bf4ae415235a36c39ea4a Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 10 Nov 2005 12:58:00 -0800
Subject: [PATCH] --- yaml --- r: 13785 b: refs/heads/master c:
 b6cbc3b6fe588c0ea1341d10413e12c2a96a6032 h: refs/heads/master i:   13783:
 61ed075d500161e58023f6784aaad877b8ec410d v: v3

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

diff --git a/[refs] b/[refs]
index 506dd93488a4..3f38914c9013 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f23c523f32324e5b5f39565cbcb0a8ff8923019
+refs/heads/master: b6cbc3b6fe588c0ea1341d10413e12c2a96a6032
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 65aae2828f39..32267d538b17 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -3903,6 +3903,8 @@ bnx2_test_loopback(struct bnx2 *bp)
 
 	pkt_size = 1514;
 	skb = dev_alloc_skb(pkt_size);
+	if (!skb)
+		return -ENOMEM;
 	packet = skb_put(skb, pkt_size);
 	memcpy(packet, bp->mac_addr, 6);
 	memset(packet + 6, 0x0, 8);