---

yaml --- r: 21247 b: refs/heads/master c: 20a4402 h: refs/heads/master i: 21245: 071916e 21243: 5b6b3e8 21239: 216ac4d 21231: 1976ec1 21215: 1793315 21183: 600687f 21119: f58ddc3 20991: d2687a6 v: v3
git-mirror · Mar 3, 2006 · 08586e6 · 08586e6
1 parent 5268966
commit 08586e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f226fe97e8025440aa330aa2c8e1c66bfdc96b
+refs/heads/master: 20a44028f06030a71a1250ad8efb0a7fb556c3ea
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -2678,7 +2678,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
 			  E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )
 			return 0;
 	}
-	if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {
+	if (skb->len > MINIMUM_DHCP_PACKET_SIZE) {
 		struct ethhdr *eth = (struct ethhdr *) skb->data;
 		if ((htons(ETH_P_IP) == eth->h_proto)) {
 			const struct iphdr *ip =