From 08586e62ce30ff78bf1cd5eb08ac0491acbfc258 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 2 Mar 2006 18:18:08 -0800
Subject: [PATCH] --- yaml --- r: 21247 b: refs/heads/master c:
 20a44028f06030a71a1250ad8efb0a7fb556c3ea h: refs/heads/master i:   21245:
 071916e1b1cf56a3020654dcc79b8fe6706159c6   21243:
 5b6b3e87ed0a5c40c6c430d5b4c5b0c194aff9b2   21239:
 216ac4dd25d9af1d5ef21f70e7f5bbe4efc99a37   21231:
 1976ec10dd892130f0e9bd4a32a90594d594e631   21215:
 1793315383ecf64aa4a968f6bc0520fc9d9ec0f0   21183:
 600687f9df627992944d85dc8df3c1fbcbbe599d   21119:
 f58ddc35e81569b1c01ff252d241eeb286a3af82   20991:
 d2687a6199f374786d9e20952407885b26b64d5a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb4d45efffc0..23fc17b94501 100644
--- 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
index 0109cc72746c..a525c95266f1 100644
--- 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 =