---

yaml --- r: 277543 b: refs/heads/master c: ad79eef h: refs/heads/master i: 277541: c3f1b39 277539: 90189f9 277535: 55b98b4 v: v3
git-mirror · Nov 14, 2011 · f0a1db4 · f0a1db4
1 parent 7bd77eb
commit f0a1db4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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");
 }