aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0109cc72746..a525c95266f 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2678,7 +2678,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)
2678 E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) ) 2678 E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )
2679 return 0; 2679 return 0;
2680 } 2680 }
2681 if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) { 2681 if (skb->len > MINIMUM_DHCP_PACKET_SIZE) {
2682 struct ethhdr *eth = (struct ethhdr *) skb->data; 2682 struct ethhdr *eth = (struct ethhdr *) skb->data;
2683 if ((htons(ETH_P_IP) == eth->h_proto)) { 2683 if ((htons(ETH_P_IP) == eth->h_proto)) {
2684 const struct iphdr *ip = 2684 const struct iphdr *ip =