---

yaml --- r: 233889 b: refs/heads/master c: 6c91afe h: refs/heads/master i: 233887: 81ff3b1 v: v3
git-mirror · Mar 9, 2011 · 302dc1c · 302dc1c
1 parent d0cb2db
commit 302dc1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e380688217feba40db450253d16e9fb2c59a625a
+refs/heads/master: 6c91afe1a984d43f922a6a70c7c390b7fb8de45e
diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c
@@ -670,7 +670,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
 			     ifap = &ifa->ifa_next) {
 				if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
 				    sin_orig.sin_addr.s_addr ==
-							ifa->ifa_address) {
+							ifa->ifa_local) {
 					break; /* found */
 				}
 			}
@@ -1040,8 +1040,8 @@ static void inetdev_send_gratuitous_arp(struct net_device *dev,
 		return;
 
 	arp_send(ARPOP_REQUEST, ETH_P_ARP,
-		 ifa->ifa_address, dev,
-		 ifa->ifa_address, NULL,
+		 ifa->ifa_local, dev,
+		 ifa->ifa_local, NULL,
 		 dev->dev_addr, NULL);
 }