Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/mac80211/rc80211_pid_algo.c

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index f84041d1f623..4afce0572806 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -750,9 +750,9 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
                 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name);
                 b->htype = dev->type; /* can cause undefined behavior */
         }
+
+        /* server_ip and your_ip address are both already zero per RFC2131 */
         b->hlen = dev->addr_len;
-        b->your_ip = NONE;
-        b->server_ip = NONE;
         memcpy(b->hw_addr, dev->dev_addr, dev->addr_len);
         b->secs = htons(jiffies_diff / HZ);
         b->xid = d->xid;