From 3061fb58a69b043fa6e0ced49239be04c9400457 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 29 Nov 2005 19:23:59 -0800 Subject: [PATCH] --- yaml --- r: 14887 b: refs/heads/master c: a174fd88d2b73c1933ea24ed533354d618c7d089 h: refs/heads/master i: 14885: 22d60b387b190f8517819cc244830a9e22eb7a27 14883: 1303164038090f387fe138a627bd411aa8cf32f0 14879: ee0652ae9575c451cbcdf2e949a797881655917b v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index a021ee8aabf2..41efc9a51b4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5366d9e24d1e864e48e1705c9b7c21cfc0e9cea +refs/heads/master: a174fd88d2b73c1933ea24ed533354d618c7d089 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 8b207f0e139e..e0ae248b4313 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/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 =