Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

net/atm/lec.c

@@ -552,15 +552,9 @@ static struct atmdev_ops lecdev_ops = {
 };
 
 static struct atm_dev lecatm_dev = {
-        &lecdev_ops,
-        NULL,	    /*PHY*/
-        "lec",	    /*type*/
-        999,	    /*dummy device number*/
-        NULL,NULL,  /*no VCCs*/
-        NULL,NULL,  /*no data*/
-        0,	    /*no flags*/
-        NULL,	    /* no local address*/
-        { 0 }	    /*no ESI or rest of the atm_dev struct things*/
+	.ops	= &lecdev_ops,
+	.type	= "lec",
+	.number	= 999,	/* dummy device number */
 };
 
 /*

net/core/rtnetlink.c

@@ -539,9 +539,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
 }
 
 struct notifier_block rtnetlink_dev_notifier = {
-	rtnetlink_event,
-	NULL,
-	0
+	.notifier_call	= rtnetlink_event,
 };
 
 

net/netlink/netlink_dev.c

@@ -170,16 +170,46 @@ static struct file_operations netlink_fops = {
 	.release =	netlink_release,
 };
 
-static struct { char *name; int minor; } entries[] = {
-	{"route", 0},
-	{"skip", 1},
-	{"usersock", 2},
-	{"fwmonitor", 3},
-	{"tcpdiag", 4},
-	{"arpd", 8},
-	{"route6", 11},
-	{"ip6_fw", 13},
-	{"dnrtmsg", 13},
+static struct {
+	char *name;
+	int minor;
+} entries[] = {
+	{
+		.name	= "route",
+		.minor	= 0,
+	},
+	{
+		.name	= "skip",
+		.minor	= 1,
+	},
+	{
+		.name	= "usersock",
+		.minor	= 2,
+	},
+	{
+		.name	= "fwmonitor",
+		.minor	= 3,
+	},
+	{
+		.name	= "tcpdiag",
+		.minor	= 4,
+	},
+	{
+		.name	= "arpd",
+		.minor	= 8,
+	},
+	{
+		.name	= "route6",
+		.minor	= 11,
+	},
+	{
+		.name	= "ip6_fw",
+		.minor	= 13,
+	},
+	{
+		.name	= "dnrtmsg",
+		.minor	= 13,
+	},
 };
 
 static void __init make_devfs_entries (const char *name, int minor)