diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-03-02 21:18:08 -0500 |
|---|---|---|
| committer | root <root@jk-desktop.jf.intel.com> | 2006-03-02 21:18:08 -0500 |
| commit | 20a44028f06030a71a1250ad8efb0a7fb556c3ea (patch) | |
| tree | 3e8bb3e77b4e0453a24aad97f3f6c3700ea6fd48 /drivers/net/e1000 | |
| parent | c5f226fe97e8025440aa330aa2c8e1c66bfdc96b (diff) | |
e1000: Fix dhcp issue when the skb structure fields are not filled properly
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>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 0109cc72746c..a525c95266f1 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 = |