From f0a1db4a8afafc1bb615c695da293d8f48dc5706 Mon Sep 17 00:00:00 2001
From: "RongQing.Li" <roy.qing.li@gmail.com>
Date: Mon, 14 Nov 2011 14:37:24 -0500
Subject: [PATCH] --- yaml --- r: 277543 b: refs/heads/master c:
 ad79eefc42d56cb851a2b28a86e481cf1161005e h: refs/heads/master i:   277541:
 c3f1b3974e37c11554fa4dc02f8d1092fb2a3a48   277539:
 90189f932f83c5d5171340c249a3893fd8d5ecc2   277535:
 55b98b4d1a6794fc30903c6b069e3ec3aa9699f5 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/ipconfig.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a09b37678499..e2ee0b71fe7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5219e4c93c281377700206ae2b3ba4d91653d2ba
+refs/heads/master: ad79eefc42d56cb851a2b28a86e481cf1161005e
diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c
index 0da2afc97f32..7f17ba8b0318 100644
--- a/trunk/net/ipv4/ipconfig.c
+++ b/trunk/net/ipv4/ipconfig.c
@@ -822,8 +822,13 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_IP);
 	if (dev_hard_header(skb, dev, ntohs(skb->protocol),
-			    dev->broadcast, dev->dev_addr, skb->len) < 0 ||
-	    dev_queue_xmit(skb) < 0)
+			    dev->broadcast, dev->dev_addr, skb->len) < 0) {
+		kfree_skb(skb);
+		printk("E");
+		return;
+	}
+
+	if (dev_queue_xmit(skb) < 0)
 		printk("E");
 }