patch-2.4.11-dontuse linux/net/ipv4/ip_gre.c

Next file: linux/net/ipv4/ipconfig.c
Previous file: linux/net/ipv4/inetpeer.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.10/linux/net/ipv4/ip_gre.c linux/net/ipv4/ip_gre.c
@@ -284,7 +284,7 @@
 		}
 		if (i==100)
 			goto failed;
-		memcpy(parms->name, dev->name, IFNAMSIZ);
+		memcpy(nt->parms.name, dev->name, IFNAMSIZ);
 	}
 	if (register_netdevice(dev) < 0)
 		goto failed;
@@ -1011,6 +1011,7 @@
 			err = -EPERM;
 			if (t == &ipgre_fb_tunnel)
 				goto done;
+			dev = t->dev;
 		}
 		err = unregister_netdevice(dev);
 		break;
@@ -1296,3 +1297,4 @@
 }
 
 #endif
+MODULE_LICENSE("GPL");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)