diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-12-05 15:48:41 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-12-05 15:48:41 +0000 |
| commit | 292d4ed32e35df4755052b5002e533348d1648fd (patch) | |
| tree | 8522e6bab962696bd25a6c02fb068c674a09b7ee /drivers/net/e1000/e1000_main.c | |
| parent | 3c6af7fa787f21f8873a050568ed892312899eb5 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
| download | op-kernel-dev-292d4ed32e35df4755052b5002e533348d1648fd.zip op-kernel-dev-292d4ed32e35df4755052b5002e533348d1648fd.tar.gz | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 8b207f0..e0ae248 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2621,19 +2621,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb) E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) ) return 0; } - if(htons(ETH_P_IP) == skb->protocol) { - const struct iphdr *ip = skb->nh.iph; - if(IPPROTO_UDP == ip->protocol) { - struct udphdr *udp = (struct udphdr *)(skb->h.uh); - if(ntohs(udp->dest) == 67) { - offset = (uint8_t *)udp + 8 - skb->data; - length = skb->len - offset; - - return e1000_mng_write_dhcp_info(hw, - (uint8_t *)udp + 8, length); - } - } - } else if((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) { + if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) { struct ethhdr *eth = (struct ethhdr *) skb->data; if((htons(ETH_P_IP) == eth->h_proto)) { const struct iphdr *ip = |
