Skip to content

Commit

Permalink
e1000: Fix dhcp issue when the skb structure fields are not filled pr…
Browse files Browse the repository at this point in the history
…operly

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
  • Loading branch information
Jeff Kirsher authored and root committed Mar 3, 2006
1 parent c5f226f commit 20a4402
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 20a4402

Please sign in to comment.