patch-2.3.99-pre7 linux/net/sched/sch_teql.c

Next file: linux/net/socket.c
Previous file: linux/net/sched/sch_tbf.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/net/sched/sch_teql.c linux/net/sched/sch_teql.c
@@ -70,7 +70,6 @@
 	struct net_device dev;
 	struct Qdisc *slaves;
 	struct net_device_stats stats;
-	char name[IFNAMSIZ];
 };
 
 struct teql_sched_data
@@ -469,11 +468,10 @@
 	rtnl_lock();
 
 	the_master.dev.priv = (void*)&the_master;
-	the_master.dev.name = (void*)&the_master.name;
 	err = dev_alloc_name(&the_master.dev, "teql%d");
 	if (err < 0)
 		return err;
-	memcpy(the_master.qops.id, the_master.name, IFNAMSIZ);
+	memcpy(the_master.qops.id, the_master.dev.name, IFNAMSIZ);
 	the_master.dev.init = teql_master_init;
 
 	err = register_netdevice(&the_master.dev);

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