aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipconfig.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-05 15:26:41 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 15:26:41 -0500
commit255333c1db3ec63921de29b134418a4e56e5921e (patch)
treeb1cd99373cabfa6fed020496d4d74500e7bc7e92 /net/ipv4/ipconfig.c
parent9a43b709a230705ca40a6f854a334a02334a3c1c (diff)
parent0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/rc80211_pid_algo.c
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r--net/ipv4/ipconfig.c4
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
750 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name); 750 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name);
751 b->htype = dev->type; /* can cause undefined behavior */ 751 b->htype = dev->type; /* can cause undefined behavior */
752 } 752 }
753
754 /* server_ip and your_ip address are both already zero per RFC2131 */
753 b->hlen = dev->addr_len; 755 b->hlen = dev->addr_len;
754 b->your_ip = NONE;
755 b->server_ip = NONE;
756 memcpy(b->hw_addr, dev->dev_addr, dev->addr_len); 756 memcpy(b->hw_addr, dev->dev_addr, dev->addr_len);
757 b->secs = htons(jiffies_diff / HZ); 757 b->secs = htons(jiffies_diff / HZ);
758 b->xid = d->xid; 758 b->xid = d->xid;