patch-2.1.38 linux/fs/nfs/nfsroot.c

• Lines: 54
• Date: Wed May 14 15:01:21 1997
• Orig file: v2.1.37/linux/fs/nfs/nfsroot.c
• Orig date: Mon Apr 14 16:28:17 1997

diff -u --recursive --new-file v2.1.37/linux/fs/nfs/nfsroot.c linux/fs/nfs/nfsroot.c
@@ -228,6 +228,8 @@
 	unsigned long	oldfs;
 	int		err;
 
+	memset(&route, 0, sizeof(struct rtentry));	/* or else! */
+
 	route.rt_dev = dev->name;
 	route.rt_mtu = dev->mtu;
 	route.rt_flags = RTF_UP;
@@ -247,9 +249,15 @@
 	set_fs(KERNEL_DS);
 	err = ip_rt_ioctl(op, &route);
 	set_fs(oldfs);
-	printk(KERN_NOTICE "%s route %s %s %s: res %d\n",
-			(op == SIOCADDRT? "add" : "del"),
-			in_ntoa(dest), in_ntoa(mask), in_ntoa(gw), err);
+
+	/* in_ntoa in ipv4/utils.c uses a single static buffer, so
+	 * must make multiple printk calls, one for each in_ntoa
+	 * invocation...
+	 */
+	printk(KERN_NOTICE "%s route ", (op == SIOCADDRT ? "addr" : "del"));
+	printk("%s ", in_ntoa(dest));
+	printk("%s ", in_ntoa(mask));
+	printk("%s: res %d\n", in_ntoa(gw), err);
 
 	return err;
 }
@@ -280,8 +288,10 @@
 		nextp = openp->next;
 		openp->next = NULL;
 		if (openp->dev != root_dev) {
-			if (!(openp->old_flags & IFF_UP))
+			if (!(openp->old_flags & IFF_UP)) {
 				dev_close(openp->dev);
+			}
+
 			openp->dev->flags = openp->old_flags;
 		}
 		kfree_s(openp, sizeof(struct open_dev));
@@ -1322,6 +1332,13 @@
 	root_dev->pa_mask    = netmask;
 	root_dev->pa_brdaddr = root_dev->pa_addr | ~root_dev->pa_mask;
 	root_dev->pa_dstaddr = 0;
+
+	/* Sticky situation, but it has a solution.  We opened it earlier,
+	 * but before we knew what pa_addr etc. to give to it, thus the
+	 * routing code did not add a RTF_LOCAL route for it (how could
+	 * it?) so we send the pseudo device state change event now.  -DaveM
+	 */
+	ip_rt_event(NETDEV_CHANGE, root_dev);
 
 	/*
 	 * Now add a route to the server. If there is no gateway given,