NET: Use ISO C struct initializers.

60 files changed, 1546 insertions, 1546 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 0e10441071ed..5865f134cbd5 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -52,7 +52,7 @@ static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
 static int vlan_device_event(struct notifier_block *, unsigned long, void *);
 
 struct notifier_block vlan_notifier_block = {
-	notifier_call: vlan_device_event,
+	.notifier_call = vlan_device_event,
 };
 
 /* These may be changed at run-time through IOCTLs */
@@ -64,11 +64,11 @@ unsigned short vlan_name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
 unsigned short vlan_default_dev_flags = 1;
 
 static struct packet_type vlan_packet_type = {
-	type: __constant_htons(ETH_P_8021Q),
-	dev:  NULL,
-	func: vlan_skb_recv, /* VLAN receive method */
-	data: (void *)(-1),  /* Set here '(void *)1' when this code can SHARE SKBs */
-	next: NULL
+	.type = __constant_htons(ETH_P_8021Q),
+	.dev =NULL,
+	.func = vlan_skb_recv, /* VLAN receive method */
+	.data = (void *)(-1),  /* Set here '(void *)1' when this code can SHARE SKBs */
+	.next = NULL
 };
 
 /* End of global variables definitions. */
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 58504f5c30a6..b5b294b34aa8 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -75,8 +75,8 @@ static char term_msg[]   = "***KERNEL:  Out of buffer space!***\n";
  */
 
 static struct file_operations vlan_fops = {
-	read:	vlan_proc_read,
-	ioctl: NULL, /* vlan_proc_ioctl */
+	.read =	vlan_proc_read,
+	.ioctl = NULL, /* vlan_proc_ioctl */
 };
 
 /*
@@ -84,8 +84,8 @@ static struct file_operations vlan_fops = {
  */
 
 static struct file_operations vlandev_fops = {
-	read:	vlan_proc_read,
-	ioctl:	NULL, /* vlan_proc_ioctl */
+	.read =	vlan_proc_read,
+	.ioctl =NULL, /* vlan_proc_ioctl */
 };
 
 /*
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index f5048d1f7e13..76264bf9b9b6 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -841,7 +841,7 @@ out0:	kfree_skb(skb);
 }
 
 static struct notifier_block aarp_notifier = {
-	notifier_call:	aarp_device_event,
+	.notifier_call =aarp_device_event,
 };
 
 static char aarp_snap_id[] = { 0x00, 0x00, 0x00, 0x80, 0xF3 };
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index a8b7826fc2f6..cc4585aeb8e1 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1895,30 +1895,30 @@ static int atalk_ioctl(struct socket *sock,unsigned int cmd, unsigned long arg)
 }
 
 static struct net_proto_family atalk_family_ops = {
-	family:	PF_APPLETALK,
-	create:	atalk_create,
+	.family =PF_APPLETALK,
+	.create =atalk_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops)=
 {
-	family:		PF_APPLETALK,
-
-	release:	atalk_release,
-	bind:		atalk_bind,
-	connect:	atalk_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	atalk_getname,
-	poll:		datagram_poll,
-	ioctl:		atalk_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	atalk_sendmsg,
-	recvmsg:	atalk_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_APPLETALK,
+
+	.release =	atalk_release,
+	.bind =		atalk_bind,
+	.connect =	atalk_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	atalk_getname,
+	.poll =		datagram_poll,
+	.ioctl =	atalk_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	atalk_sendmsg,
+	.recvmsg =	atalk_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 3ae5ae8757aa..96013cb4c0e5 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -274,14 +274,14 @@ static void clip_neigh_error(struct neighbour *neigh,struct sk_buff *skb)
 
 
 static struct neigh_ops clip_neigh_ops = {
-	family:			AF_INET,
-	destructor:		clip_neigh_destroy,
-	solicit:		clip_neigh_solicit,
-	error_report:		clip_neigh_error,
-	output:			dev_queue_xmit,
-	connected_output:	dev_queue_xmit,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET,
+	.destructor =		clip_neigh_destroy,
+	.solicit =		clip_neigh_solicit,
+	.error_report =		clip_neigh_error,
+	.output =		dev_queue_xmit,
+	.connected_output =	dev_queue_xmit,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 
@@ -699,7 +699,7 @@ static void atmarpd_close(struct atm_vcc *vcc)
 
 
 static struct atmdev_ops atmarpd_dev_ops = {
-	close:	atmarpd_close,
+	.close =atmarpd_close,
 };
 
 
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 66c4286eee72..513f008c8397 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -736,8 +736,8 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
 }
 
 static struct atmdev_ops mpc_ops = { /* only send is required */
-	close:	mpoad_close,
-	send:	msg_from_mpoad
+	.close =mpoad_close,
+	.send =	msg_from_mpoad
 };
 
 static struct atm_dev mpc_dev = {
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index fa4ecd64cc80..cd46ce110084 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -42,8 +42,8 @@ static int parse_qos(const char *buff, int len);
  *   Define allowed FILE OPERATIONS
  */
 static struct file_operations mpc_file_operations = {
-	read:		proc_mpc_read,
-	write:		proc_mpc_write,
+	.read =		proc_mpc_read,
+	.write =	proc_mpc_write,
 };
 
 static int print_header(char *buff,struct mpoa_client *mpc){
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 5ec53e6a73ad..b9aa77392a80 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -266,8 +266,8 @@ static int pppoatm_devppp_ioctl(struct ppp_channel *chan, unsigned int cmd,
 }
 
 static /*const*/ struct ppp_channel_ops pppoatm_ops = {
-	start_xmit: pppoatm_send,
-	ioctl: pppoatm_devppp_ioctl,
+	.start_xmit = pppoatm_send,
+	.ioctl = pppoatm_devppp_ioctl,
 };
 
 static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, unsigned long arg)
diff --git a/net/atm/proc.c b/net/atm/proc.c
index bc11d58e7931..5839ebdf7aba 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -57,11 +57,11 @@ static ssize_t proc_spec_atm_read(struct file *file,char *buf,size_t count,
     loff_t *pos);
 
 static struct file_operations proc_dev_atm_operations = {
-	read:		proc_dev_atm_read,
+	.read =		proc_dev_atm_read,
 };
 
 static struct file_operations proc_spec_atm_operations = {
-	read:		proc_spec_atm_read,
+	.read =		proc_spec_atm_read,
 };
 
 static void add_stats(char *buf,const char *aal,
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 5f83cd5e6c28..fd2a99bba4f6 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -78,24 +78,24 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
 
 
 static struct proto_ops SOCKOPS_WRAPPED(pvc_proto_ops) = {
-	family:		PF_ATMPVC,
-
-	release:	atm_release,
-	bind:		pvc_bind,
-	connect:	pvc_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	pvc_getname,
-	poll:		atm_poll,
-	ioctl:		atm_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	pvc_shutdown,
-	setsockopt:	atm_setsockopt,
-	getsockopt:	atm_getsockopt,
-	sendmsg:	atm_sendmsg,
-	recvmsg:	atm_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_ATMPVC,
+
+	.release =	atm_release,
+	.bind =		pvc_bind,
+	.connect =	pvc_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	pvc_getname,
+	.poll =		atm_poll,
+	.ioctl =	atm_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	pvc_shutdown,
+	.setsockopt =	atm_setsockopt,
+	.getsockopt =	atm_getsockopt,
+	.sendmsg =	atm_sendmsg,
+	.recvmsg =	atm_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 
@@ -111,8 +111,8 @@ static int pvc_create(struct socket *sock,int protocol)
 
 
 static struct net_proto_family pvc_family_ops = {
-	family:	PF_ATMPVC,
-	create:	pvc_create,
+	.family =PF_ATMPVC,
+	.create =pvc_create,
 };
 
 
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 2d27f200c901..03d9c88c0ff7 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -227,8 +227,8 @@ static void sigd_close(struct atm_vcc *vcc)
 
 
 static struct atmdev_ops sigd_dev_ops = {
-	close:	sigd_close,
-	send:	sigd_send
+	.close =sigd_close,
+	.send =	sigd_send
 };
 
 
diff --git a/net/atm/svc.c b/net/atm/svc.c
index cd00bc5befe5..fb9fc7d95397 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -391,24 +391,24 @@ static int svc_getsockopt(struct socket *sock,int level,int optname,
 
 
 static struct proto_ops SOCKOPS_WRAPPED(svc_proto_ops) = {
-	family:		PF_ATMSVC,
-
-	release:	svc_release,
-	bind:		svc_bind,
-	connect:	svc_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		svc_accept,
-	getname:	svc_getname,
-	poll:		atm_poll,
-	ioctl:		atm_ioctl,
-	listen:		svc_listen,
-	shutdown:	svc_shutdown,
-	setsockopt:	svc_setsockopt,
-	getsockopt:	svc_getsockopt,
-	sendmsg:	atm_sendmsg,
-	recvmsg:	atm_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_ATMSVC,
+
+	.release =	svc_release,
+	.bind =		svc_bind,
+	.connect =	svc_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	svc_accept,
+	.getname =	svc_getname,
+	.poll =		atm_poll,
+	.ioctl =	atm_ioctl,
+	.listen =	svc_listen,
+	.shutdown =	svc_shutdown,
+	.setsockopt =	svc_setsockopt,
+	.getsockopt =	svc_getsockopt,
+	.sendmsg =	atm_sendmsg,
+	.recvmsg =	atm_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 
@@ -430,8 +430,8 @@ static int svc_create(struct socket *sock,int protocol)
 
 
 static struct net_proto_family svc_family_ops = {
-	family:	PF_ATMSVC,
-	create:	svc_create,
+	.family =PF_ATMSVC,
+	.create =svc_create,
 };
 
 
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 8bf321a41698..661335502baf 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1810,29 +1810,29 @@ static int ax25_get_info(char *buffer, char **start, off_t offset, int length)
 }
 
 static struct net_proto_family ax25_family_ops = {
-	family:		PF_AX25,
-	create:		ax25_create,
+	.family =	PF_AX25,
+	.create =	ax25_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(ax25_proto_ops) = {
-	family:		PF_AX25,
-
-	release:	ax25_release,
-	bind:		ax25_bind,
-	connect:	ax25_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		ax25_accept,
-	getname:	ax25_getname,
-	poll:		datagram_poll,
-	ioctl:		ax25_ioctl,
-	listen:		ax25_listen,
-	shutdown:	ax25_shutdown,
-	setsockopt:	ax25_setsockopt,
-	getsockopt:	ax25_getsockopt,
-	sendmsg:	ax25_sendmsg,
-	recvmsg:	ax25_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_AX25,
+
+	.release =	ax25_release,
+	.bind =		ax25_bind,
+	.connect =	ax25_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	ax25_accept,
+	.getname =	ax25_getname,
+	.poll =		datagram_poll,
+	.ioctl =	ax25_ioctl,
+	.listen =	ax25_listen,
+	.shutdown =	ax25_shutdown,
+	.setsockopt =	ax25_setsockopt,
+	.getsockopt =	ax25_getsockopt,
+	.sendmsg =	ax25_sendmsg,
+	.recvmsg =	ax25_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
@@ -1842,12 +1842,12 @@ SOCKOPS_WRAP(ax25_proto, PF_AX25);
  *	Called by socket.c on kernel start up
  */
 static struct packet_type ax25_packet_type = {
-	type:		__constant_htons(ETH_P_AX25),
-	func:		ax25_kiss_rcv,
+	.type =		__constant_htons(ETH_P_AX25),
+	.func =		ax25_kiss_rcv,
 };
 
 static struct notifier_block ax25_dev_notifier = {
-	notifier_call:	ax25_device_event,
+	.notifier_call =ax25_device_event,
 };
 
 EXPORT_SYMBOL(ax25_encapsulate);
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index f5ee87d70574..682c84c1623f 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -80,7 +80,7 @@ static struct hci_sec_filter hci_sec_filter = {
 };
 
 static struct bluez_sock_list hci_sk_list = {
-	lock: RW_LOCK_UNLOCKED
+	.lock = RW_LOCK_UNLOCKED
 };
 
 /* Send frame to RAW socket */
@@ -522,22 +522,22 @@ int hci_sock_getsockopt(struct socket *sock, int level, int optname, char *optva
 }
 
 struct proto_ops hci_sock_ops = {
-	family:		PF_BLUETOOTH,
-	release:	hci_sock_release,
-	bind:		hci_sock_bind,
-	getname:	hci_sock_getname,
-	sendmsg:	hci_sock_sendmsg,
-	recvmsg:	hci_sock_recvmsg,
-	ioctl:		hci_sock_ioctl,
-	poll:		datagram_poll,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	hci_sock_setsockopt,
-	getsockopt:	hci_sock_getsockopt,
-	connect:	sock_no_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	mmap:		sock_no_mmap
+	.family =	PF_BLUETOOTH,
+	.release =	hci_sock_release,
+	.bind =		hci_sock_bind,
+	.getname =	hci_sock_getname,
+	.sendmsg =	hci_sock_sendmsg,
+	.recvmsg =	hci_sock_recvmsg,
+	.ioctl =	hci_sock_ioctl,
+	.poll =		datagram_poll,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	hci_sock_setsockopt,
+	.getsockopt =	hci_sock_getsockopt,
+	.connect =	sock_no_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.mmap =		sock_no_mmap
 };
 
 static int hci_sock_create(struct socket *sock, int protocol)
@@ -600,12 +600,12 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,
 }
 
 struct net_proto_family hci_sock_family_ops = {
-	family: PF_BLUETOOTH,
-	create: hci_sock_create
+	.family = PF_BLUETOOTH,
+	.create = hci_sock_create
 };
 
 struct notifier_block hci_sock_nblock = {
-	notifier_call: hci_sock_dev_event
+	.notifier_call = hci_sock_dev_event
 };
 
 int hci_sock_init(void)
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 7eb6e1e7314c..015cc3f06c8a 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -64,7 +64,7 @@
 static struct proto_ops l2cap_sock_ops;
 
 struct bluez_sock_list l2cap_sk_list = {
-	lock: RW_LOCK_UNLOCKED
+	.lock = RW_LOCK_UNLOCKED
 };
 
 static int l2cap_conn_del(struct hci_conn *conn, int err);
@@ -1973,38 +1973,38 @@ static int l2cap_read_proc(char *buf, char **start, off_t offset, int count, int
 }
 
 static struct proto_ops l2cap_sock_ops = {
-	family:		PF_BLUETOOTH,
-	release:	l2cap_sock_release,
-	bind:		l2cap_sock_bind,
-	connect:	l2cap_sock_connect,
-	listen:		l2cap_sock_listen,
-	accept:		l2cap_sock_accept,
-	getname:	l2cap_sock_getname,
-	sendmsg:	l2cap_sock_sendmsg,
-	recvmsg:	bluez_sock_recvmsg,
-	poll:		bluez_sock_poll,
-	socketpair:	sock_no_socketpair,
-	ioctl:		sock_no_ioctl,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	l2cap_sock_setsockopt,
-	getsockopt:	l2cap_sock_getsockopt,
-	mmap:		sock_no_mmap
+	.family =	PF_BLUETOOTH,
+	.release =	l2cap_sock_release,
+	.bind =		l2cap_sock_bind,
+	.connect =	l2cap_sock_connect,
+	.listen =	l2cap_sock_listen,
+	.accept =	l2cap_sock_accept,
+	.getname =	l2cap_sock_getname,
+	.sendmsg =	l2cap_sock_sendmsg,
+	.recvmsg =	bluez_sock_recvmsg,
+	.poll =		bluez_sock_poll,
+	.socketpair =	sock_no_socketpair,
+	.ioctl =	sock_no_ioctl,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	l2cap_sock_setsockopt,
+	.getsockopt =	l2cap_sock_getsockopt,
+	.mmap =		sock_no_mmap
 };
 
 static struct net_proto_family l2cap_sock_family_ops = {
-	family:		PF_BLUETOOTH,
-	create:		l2cap_sock_create
+	.family =	PF_BLUETOOTH,
+	.create =	l2cap_sock_create
 };
 
 static struct hci_proto l2cap_hci_proto = {
-	name:		"L2CAP",
-	id:		HCI_PROTO_L2CAP,
-	connect_ind:	l2cap_connect_ind,
-	connect_cfm:	l2cap_connect_cfm,
-	disconn_ind:	l2cap_disconn_ind,
-	recv_acldata:	l2cap_recv_acldata,
-	auth_cfm:	l2cap_auth_cfm,
-	encrypt_cfm:	l2cap_encrypt_cfm
+	.name =		"L2CAP",
+	.id =		HCI_PROTO_L2CAP,
+	.connect_ind =	l2cap_connect_ind,
+	.connect_cfm =	l2cap_connect_cfm,
+	.disconn_ind =	l2cap_disconn_ind,
+	.recv_acldata =	l2cap_recv_acldata,
+	.auth_cfm =	l2cap_auth_cfm,
+	.encrypt_cfm =	l2cap_encrypt_cfm
 };
 
 int __init l2cap_init(void)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 064b1a32a053..eb0ef4a11766 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -64,7 +64,7 @@
 static struct proto_ops sco_sock_ops;
 
 static struct bluez_sock_list sco_sk_list = {
-	lock: RW_LOCK_UNLOCKED
+	.lock = RW_LOCK_UNLOCKED
 };
 
 static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
@@ -936,36 +936,36 @@ static int sco_read_proc(char *buf, char **start, off_t offset, int count, int *
 }
 
 static struct proto_ops sco_sock_ops = {
-	family:		PF_BLUETOOTH,
-	release:	sco_sock_release,
-	bind:		sco_sock_bind,
-	connect:	sco_sock_connect,
-	listen:		sco_sock_listen,
-	accept:		sco_sock_accept,
-	getname:	sco_sock_getname,
-	sendmsg:	sco_sock_sendmsg,
-	recvmsg:	bluez_sock_recvmsg,
-	poll:		bluez_sock_poll,
-	socketpair:	sock_no_socketpair,
-	ioctl:		sock_no_ioctl,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	sco_sock_setsockopt,
-	getsockopt:	sco_sock_getsockopt,
-	mmap:		sock_no_mmap
+	.family =	PF_BLUETOOTH,
+	.release =	sco_sock_release,
+	.bind =		sco_sock_bind,
+	.connect =	sco_sock_connect,
+	.listen =	sco_sock_listen,
+	.accept =	sco_sock_accept,
+	.getname =	sco_sock_getname,
+	.sendmsg =	sco_sock_sendmsg,
+	.recvmsg =	bluez_sock_recvmsg,
+	.poll =		bluez_sock_poll,
+	.socketpair =	sock_no_socketpair,
+	.ioctl =	sock_no_ioctl,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	sco_sock_setsockopt,
+	.getsockopt =	sco_sock_getsockopt,
+	.mmap =		sock_no_mmap
 };
 
 static struct net_proto_family sco_sock_family_ops = {
-	family:		PF_BLUETOOTH,
-	create:		sco_sock_create
+	.family =	PF_BLUETOOTH,
+	.create =	sco_sock_create
 };
 
 static struct hci_proto sco_hci_proto = {
-	name:		"SCO",
-	id:		HCI_PROTO_SCO,
-	connect_ind:	sco_connect_ind,
-	connect_cfm:	sco_connect_cfm,
-	disconn_ind:	sco_disconn_ind,
-	recv_scodata:	sco_recv_scodata,
+	.name =		"SCO",
+	.id =		HCI_PROTO_SCO,
+	.connect_ind =	sco_connect_ind,
+	.connect_cfm =	sco_connect_cfm,
+	.disconn_ind =	sco_disconn_ind,
+	.recv_scodata =	sco_recv_scodata,
 };
 
 int __init sco_init(void)
diff --git a/net/core/datagram.c b/net/core/datagram.c
index ece74de9d1ca..f588cf30eae1 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -204,8 +204,8 @@ void skb_free_datagram(struct sock *sk, struct sk_buff *skb)
 int skb_copy_datagram(const struct sk_buff *skb, int offset, char *to, int size)
 {
 	struct iovec iov = {
-		iov_base: to,
-		iov_len:  size,
+		.iov_base = to,
+		.iov_len =size,
 	};
 
 	return skb_copy_datagram_iovec(skb, offset, &iov, size);
diff --git a/net/core/ext8022.c b/net/core/ext8022.c
index e6415d51accb..a5229fa7f262 100644
--- a/net/core/ext8022.c
+++ b/net/core/ext8022.c
@@ -25,12 +25,12 @@ static func_type llc_sap_table[128];
 static int llc_users;
 
 static struct packet_type llc_packet_type = {
-	type:	__constant_htons(ETH_P_802_2),
-	func:	llc_rcv,
+	.type =	__constant_htons(ETH_P_802_2),
+	.func =	llc_rcv,
 };
 static struct packet_type llc_tr_packet_type = {
-	type:	__constant_htons(ETH_P_TR_802_2),
-	func:	llc_rcv,
+	.type =	__constant_htons(ETH_P_TR_802_2),
+	.func =	llc_rcv,
 };
 
 static int llc_rcv(struct sk_buff *skb, struct net_device *dev,
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9ebda3e92bc8..8fd802a39be6 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1471,143 +1471,143 @@ struct neigh_sysctl_table {
 	ctl_table		neigh_proto_dir[2];
 	ctl_table		neigh_root_dir[2];
 } neigh_sysctl_template = {
-	neigh_vars: {
+	.neigh_vars = {
 		{
-			ctl_name:	NET_NEIGH_MCAST_SOLICIT,
-			procname:	"mcast_solicit",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_MCAST_SOLICIT,
+			.procname =	"mcast_solicit",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_UCAST_SOLICIT,
-			procname:	"ucast_solicit",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_UCAST_SOLICIT,
+			.procname =	"ucast_solicit",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_APP_SOLICIT,
-			procname:	"app_solicit",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_APP_SOLICIT,
+			.procname =	"app_solicit",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_RETRANS_TIME,
-			procname:	"retrans_time",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_RETRANS_TIME,
+			.procname =	"retrans_time",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_REACHABLE_TIME,
-			procname:	"base_reachable_time",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec_jiffies,
+			.ctl_name =	NET_NEIGH_REACHABLE_TIME,
+			.procname =	"base_reachable_time",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec_jiffies,
 		},
 		{
-			ctl_name:	NET_NEIGH_DELAY_PROBE_TIME,
-			procname:	"delay_first_probe_time",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec_jiffies,
+			.ctl_name =	NET_NEIGH_DELAY_PROBE_TIME,
+			.procname =	"delay_first_probe_time",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec_jiffies,
 		},
 		{
-			ctl_name:	NET_NEIGH_GC_STALE_TIME,
-			procname:	"gc_stale_time",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec_jiffies,
+			.ctl_name =	NET_NEIGH_GC_STALE_TIME,
+			.procname =	"gc_stale_time",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec_jiffies,
 		},
 		{
-			ctl_name:	NET_NEIGH_UNRES_QLEN,
-			procname:	"unres_qlen",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_UNRES_QLEN,
+			.procname =	"unres_qlen",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_PROXY_QLEN,
-			procname:	"proxy_qlen",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_PROXY_QLEN,
+			.procname =	"proxy_qlen",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_ANYCAST_DELAY,
-			procname:	"anycast_delay",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_ANYCAST_DELAY,
+			.procname =	"anycast_delay",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_PROXY_DELAY,
-			procname:	"proxy_delay",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_PROXY_DELAY,
+			.procname =	"proxy_delay",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_LOCKTIME,
-			procname:	"locktime",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_LOCKTIME,
+			.procname =	"locktime",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_GC_INTERVAL,
-			procname:	"gc_interval",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec_jiffies,
+			.ctl_name =	NET_NEIGH_GC_INTERVAL,
+			.procname =	"gc_interval",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec_jiffies,
 		},
 		{
-			ctl_name:	NET_NEIGH_GC_THRESH1,
-			procname:	"gc_thresh1",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_GC_THRESH1,
+			.procname =	"gc_thresh1",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_GC_THRESH2,
-			procname:	"gc_thresh2",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_GC_THRESH2,
+			.procname =	"gc_thresh2",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_NEIGH_GC_THRESH3,
-			procname:	"gc_thresh3",
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_NEIGH_GC_THRESH3,
+			.procname =	"gc_thresh3",
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 	},
-	neigh_dev: {
+	.neigh_dev = {
 		{
-			ctl_name:	NET_PROTO_CONF_DEFAULT,
-			procname:	"default",
-			mode:		0555,
+			.ctl_name =	NET_PROTO_CONF_DEFAULT,
+			.procname =	"default",
+			.mode =	0555,
 		},
 	},
-	neigh_neigh_dir: {
+	.neigh_neigh_dir = {
 		{
-			procname:	"neigh",
-			mode:		0555,
+			.procname =	"neigh",
+			.mode =	0555,
 		},
 	},
-	neigh_proto_dir: {
+	.neigh_proto_dir = {
 		{
-			mode:		0555,
+			.mode =	0555,
 		},
 	},
-	neigh_root_dir: {
+	.neigh_root_dir = {
 		{
-			ctl_name:	CTL_NET,
-			procname:	"net",
-			mode:		0555,
+			.ctl_name =	CTL_NET,
+			.procname =	"net",
+			.mode =	0555,
 		},
 	},
 };
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index bd6284c35d40..113d8d8a02f5 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -2098,16 +2098,16 @@ static int dn_device_event(struct notifier_block *this, unsigned long event,
 }
 
 static struct notifier_block dn_dev_notifier = {
-	notifier_call:	dn_device_event,
+	.notifier_call =dn_device_event,
 };
 
 extern int dn_route_rcv(struct sk_buff *, struct net_device *, struct packet_type *);
 
 static struct packet_type dn_dix_packet_type = {
-	type:		__constant_htons(ETH_P_DNA_RT),
-	dev:		NULL,		/* All devices */
-	func:		dn_route_rcv,
-	data:		(void*)1,
+	.type =		__constant_htons(ETH_P_DNA_RT),
+	.dev =		NULL,		/* All devices */
+	.func =		dn_route_rcv,
+	.data =		(void*)1,
 };
 
 #define IS_NOT_PRINTABLE(x) ((x) < 32 || (x) > 126)
@@ -2196,29 +2196,29 @@ static int dn_get_info(char *buffer, char **start, off_t offset, int length)
 
 
 static struct net_proto_family	dn_family_ops = {
-	family:		AF_DECnet,
-	create:		dn_create,
+	.family =	AF_DECnet,
+	.create =	dn_create,
 };
 
 static struct proto_ops dn_proto_ops = {
-	family:		AF_DECnet,
-
-	release:	dn_release,
-	bind:		dn_bind,
-	connect:	dn_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		dn_accept,
-	getname:	dn_getname,
-	poll:		dn_poll,
-	ioctl:		dn_ioctl,
-	listen:		dn_listen,
-	shutdown:	dn_shutdown,
-	setsockopt:	dn_setsockopt,
-	getsockopt:	dn_getsockopt,
-	sendmsg:	dn_sendmsg,
-	recvmsg:	dn_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	AF_DECnet,
+
+	.release =	dn_release,
+	.bind =		dn_bind,
+	.connect =	dn_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	dn_accept,
+	.getname =	dn_getname,
+	.poll =		dn_poll,
+	.ioctl =	dn_ioctl,
+	.listen =	dn_listen,
+	.shutdown =	dn_shutdown,
+	.setsockopt =	dn_setsockopt,
+	.getsockopt =	dn_getsockopt,
+	.sendmsg =	dn_sendmsg,
+	.recvmsg =	dn_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #ifdef CONFIG_SYSCTL
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index ec9c8b07454f..989bcb931458 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -66,77 +66,77 @@ static void dn_send_ptp_hello(struct net_device *dev);
 
 static struct dn_dev_parms dn_dev_list[] =  {
 {
-	type:		ARPHRD_ETHER, /* Ethernet */
-	mode:		DN_DEV_BCAST,
-	state:		DN_DEV_S_RU,
-	blksize:	1498,
-	t2:		1,
-	t3:		10,
-	name:		"ethernet",
-	ctl_name:	NET_DECNET_CONF_ETHER,
-	up:		dn_eth_up,
-	timer3:		dn_send_brd_hello,
+	.type =		ARPHRD_ETHER, /* Ethernet */
+	.mode =		DN_DEV_BCAST,
+	.state =	DN_DEV_S_RU,
+	.blksize =	1498,
+	.t2 =		1,
+	.t3 =		10,
+	.name =		"ethernet",
+	.ctl_name =	NET_DECNET_CONF_ETHER,
+	.up =		dn_eth_up,
+	.timer3 =	dn_send_brd_hello,
 },
 {
-	type:		ARPHRD_IPGRE, /* DECnet tunneled over GRE in IP */
-	mode:		DN_DEV_BCAST,
-	state:		DN_DEV_S_RU,
-	blksize:	1400,
-	t2:		1,
-	t3:		10,
-	name:		"ipgre",
-	ctl_name:	NET_DECNET_CONF_GRE,
-	timer3:		dn_send_brd_hello,
+	.type =		ARPHRD_IPGRE, /* DECnet tunneled over GRE in IP */
+	.mode =		DN_DEV_BCAST,
+	.state =	DN_DEV_S_RU,
+	.blksize =	1400,
+	.t2 =		1,
+	.t3 =		10,
+	.name =		"ipgre",
+	.ctl_name =	NET_DECNET_CONF_GRE,
+	.timer3 =	dn_send_brd_hello,
 },
 #if 0
 {
-	type:		ARPHRD_X25, /* Bog standard X.25 */
-	mode:		DN_DEV_UCAST,
-	state:		DN_DEV_S_DS,
-	blksize:	230,
-	t2:		1,
-	t3:		120,
-	name:		"x25",
-	ctl_name:	NET_DECNET_CONF_X25,
-	timer3:		dn_send_ptp_hello,
+	.type =		ARPHRD_X25, /* Bog standard X.25 */
+	.mode =		DN_DEV_UCAST,
+	.state =	DN_DEV_S_DS,
+	.blksize =	230,
+	.t2 =		1,
+	.t3 =		120,
+	.name =		"x25",
+	.ctl_name =	NET_DECNET_CONF_X25,
+	.timer3 =	dn_send_ptp_hello,
 },
 #endif
 #if 0
 {
-	type:		ARPHRD_PPP, /* DECnet over PPP */
-	mode:		DN_DEV_BCAST,
-	state:		DN_DEV_S_RU,
-	blksize:	230,
-	t2:		1,
-	t3:		10,
-	name:		"ppp",
-	ctl_name:	NET_DECNET_CONF_PPP,
-	timer3:		dn_send_brd_hello,
+	.type =		ARPHRD_PPP, /* DECnet over PPP */
+	.mode =		DN_DEV_BCAST,
+	.state =	DN_DEV_S_RU,
+	.blksize =	230,
+	.t2 =		1,
+	.t3 =		10,
+	.name =		"ppp",
+	.ctl_name =	NET_DECNET_CONF_PPP,
+	.timer3 =	dn_send_brd_hello,
 },
 #endif
 #if 0
 {
-	type:		ARPHRD_DDCMP, /* DECnet over DDCMP */
-	mode:		DN_DEV_UCAST,
-	state:		DN_DEV_S_DS,
-	blksize:	230,
-	t2:		1,
-	t3:		120,
-	name:		"ddcmp",
-	ctl_name:	NET_DECNET_CONF_DDCMP,
-	timer3:		dn_send_ptp_hello,
+	.type =		ARPHRD_DDCMP, /* DECnet over DDCMP */
+	.mode =		DN_DEV_UCAST,
+	.state =	DN_DEV_S_DS,
+	.blksize =	230,
+	.t2 =		1,
+	.t3 =		120,
+	.name =		"ddcmp",
+	.ctl_name =	NET_DECNET_CONF_DDCMP,
+	.timer3 =	dn_send_ptp_hello,
 },
 #endif
 {
-	type:		ARPHRD_LOOPBACK, /* Loopback interface - always last */
-	mode:		DN_DEV_BCAST,
-	state:		DN_DEV_S_RU,
-	blksize:	1498,
-	t2:		1,
-	t3:		10,
-	name:		"loopback",
-	ctl_name:	NET_DECNET_CONF_LOOPBACK,
-	timer3:		dn_send_brd_hello,
+	.type =		ARPHRD_LOOPBACK, /* Loopback interface - always last */
+	.mode =		DN_DEV_BCAST,
+	.state =	DN_DEV_S_RU,
+	.blksize =	1498,
+	.t2 =		1,
+	.t3 =		10,
+	.name =		"loopback",
+	.ctl_name =	NET_DECNET_CONF_LOOPBACK,
+	.timer3 =	dn_send_brd_hello,
 }
 };
 
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index f25f37275ed6..2857bf2fc94c 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -54,66 +54,66 @@ static int dn_phase3_output(struct sk_buff *);
  * For talking to broadcast devices: Ethernet & PPP
  */
 static struct neigh_ops dn_long_ops = {
-	family:			AF_DECnet,
-	error_report:		dn_long_error_report,
-	output:			dn_long_output,
-	connected_output:	dn_long_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_DECnet,
+	.error_report =		dn_long_error_report,
+	.output =		dn_long_output,
+	.connected_output =	dn_long_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 /*
  * For talking to pointopoint and multidrop devices: DDCMP and X.25
  */
 static struct neigh_ops dn_short_ops = {
-	family:			AF_DECnet,
-	error_report:		dn_short_error_report,
-	output:			dn_short_output,
-	connected_output:	dn_short_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_DECnet,
+	.error_report =		dn_short_error_report,
+	.output =		dn_short_output,
+	.connected_output =	dn_short_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 /*
  * For talking to DECnet phase III nodes
  */
 static struct neigh_ops dn_phase3_ops = {
-	family:			AF_DECnet,
-	error_report:		dn_short_error_report, /* Can use short version here */
-	output:			dn_phase3_output,
-	connected_output:	dn_phase3_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit
+	.family =		AF_DECnet,
+	.error_report =		dn_short_error_report, /* Can use short version here */
+	.output =		dn_phase3_output,
+	.connected_output =	dn_phase3_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit
 };
 
 struct neigh_table dn_neigh_table = {
-	family:				PF_DECnet,
-	entry_size:			sizeof(struct dn_neigh),
-	key_len:			sizeof(dn_address),
-	hash:				dn_neigh_hash,
-	constructor:			dn_neigh_construct,
-	id:				"dn_neigh_cache",
-	parms:	{
-		tbl:			&dn_neigh_table,
-		entries:		0,
-		base_reachable_time:	30 * HZ,
-		retrans_time:		1 * HZ,
-		gc_staletime:		60 * HZ,
-		reachable_time:		30 * HZ,
-		delay_probe_time:	5 * HZ,
-		queue_len:		3,
-		ucast_probes:		0,
-		app_probes:		0,
-		mcast_probes:		0,
-		anycast_delay:		0,
-		proxy_delay:		0,
-		proxy_qlen:		0,
-		locktime:		1 * HZ,
+	.family =			PF_DECnet,
+	.entry_size =			sizeof(struct dn_neigh),
+	.key_len =			sizeof(dn_address),
+	.hash =				dn_neigh_hash,
+	.constructor =			dn_neigh_construct,
+	.id =				"dn_neigh_cache",
+	.parms ={
+		.tbl =			&dn_neigh_table,
+		.entries =		0,
+		.base_reachable_time =	30 * HZ,
+		.retrans_time =	1 * HZ,
+		.gc_staletime =	60 * HZ,
+		.reachable_time =		30 * HZ,
+		.delay_probe_time =	5 * HZ,
+		.queue_len =		3,
+		.ucast_probes =	0,
+		.app_probes =		0,
+		.mcast_probes =	0,
+		.anycast_delay =	0,
+		.proxy_delay =		0,
+		.proxy_qlen =		0,
+		.locktime =		1 * HZ,
 	},
-	gc_interval:			30 * HZ,
-	gc_thresh1:			128,
-	gc_thresh2:			512,
-	gc_thresh3:			1024,
+	.gc_interval =			30 * HZ,
+	.gc_thresh1 =			128,
+	.gc_thresh2 =			512,
+	.gc_thresh3 =			1024,
 };
 
 static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev)
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index ac798d824d44..49f28b21159c 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -112,16 +112,16 @@ static struct timer_list dn_rt_flush_timer = { function: dn_run_flush };
 int decnet_dst_gc_interval = 2;
 
 static struct dst_ops dn_dst_ops = {
-	family:			PF_DECnet,
-	protocol:		__constant_htons(ETH_P_DNA_RT),
-	gc_thresh:		128,
-	gc:			dn_dst_gc,
-	check:			dn_dst_check,
-	reroute:		dn_dst_reroute,
-	negative_advice:	dn_dst_negative_advice,
-	link_failure:		dn_dst_link_failure,
-	entry_size:		sizeof(struct dn_route),
-	entries:		ATOMIC_INIT(0),
+	.family =		PF_DECnet,
+	.protocol =		__constant_htons(ETH_P_DNA_RT),
+	.gc_thresh =		128,
+	.gc =			dn_dst_gc,
+	.check =		dn_dst_check,
+	.reroute =		dn_dst_reroute,
+	.negative_advice =	dn_dst_negative_advice,
+	.link_failure =		dn_dst_link_failure,
+	.entry_size =		sizeof(struct dn_route),
+	.entries =		ATOMIC_INIT(0),
 };
 
 static __inline__ unsigned dn_hash(unsigned short src, unsigned short dst)
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index b7d426e87ceb..d4c8db1d4162 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -58,10 +58,10 @@ struct dn_fib_rule
 };
 
 static struct dn_fib_rule default_rule = {
-	r_clntref:		ATOMIC_INIT(2),
-	r_preference:		0x7fff,
-	r_table:		DN_DEFAULT_TABLE,
-	r_action:		RTN_UNICAST
+	.r_clntref =		ATOMIC_INIT(2),
+	.r_preference =		0x7fff,
+	.r_table =		DN_DEFAULT_TABLE,
+	.r_action =		RTN_UNICAST
 };
 
 static struct dn_fib_rule *dn_fib_rules = &default_rule;
@@ -296,7 +296,7 @@ static int dn_fib_rules_event(struct notifier_block *this, unsigned long event,
 
 
 static struct notifier_block dn_fib_rules_notifier = {
-	notifier_call:		dn_fib_rules_event,
+	.notifier_call =	dn_fib_rules_event,
 };
 
 static int dn_fib_fill_rule(struct sk_buff *skb, struct dn_fib_rule *r, struct netlink_callback *cb)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 69b9d72b8fe4..1034945a82b3 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -697,29 +697,29 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
 }
 
 static struct net_proto_family econet_family_ops = {
-	family:		PF_ECONET,
-	create:		econet_create,
+	.family =	PF_ECONET,
+	.create =	econet_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
-	family:		PF_ECONET,
-
-	release:	econet_release,
-	bind:		econet_bind,
-	connect:	sock_no_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	econet_getname, 
-	poll:		datagram_poll,
-	ioctl:		econet_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	econet_sendmsg,
-	recvmsg:	econet_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_ECONET,
+
+	.release =	econet_release,
+	.bind =		econet_bind,
+	.connect =	sock_no_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	econet_getname, 
+	.poll =		datagram_poll,
+	.ioctl =	econet_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	econet_sendmsg,
+	.recvmsg =	econet_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
@@ -1068,8 +1068,8 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 }
 
 static struct packet_type econet_packet_type = {
-	type:		__constant_htons(ETH_P_ECONET),
-	func:		econet_rcv,
+	.type =		__constant_htons(ETH_P_ECONET),
+	.func =		econet_rcv,
 };
 
 static void econet_hw_initialise(void)
@@ -1103,7 +1103,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void
 }
 
 static struct notifier_block econet_netdev_notifier = {
-	notifier_call:	econet_notifier,
+	.notifier_call =econet_notifier,
 };
 
 static void __exit econet_proto_exit(void)
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 57e7f5e83b67..50beeb9a9e32 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -972,50 +972,50 @@ static int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 
 struct proto_ops inet_stream_ops = {
-	family:		PF_INET,
-
-	release:	inet_release,
-	bind:		inet_bind,
-	connect:	inet_stream_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		inet_accept,
-	getname:	inet_getname,
-	poll:		tcp_poll,
-	ioctl:		inet_ioctl,
-	listen:		inet_listen,
-	shutdown:	inet_shutdown,
-	setsockopt:	inet_setsockopt,
-	getsockopt:	inet_getsockopt,
-	sendmsg:	inet_sendmsg,
-	recvmsg:	inet_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	tcp_sendpage
+	.family =	PF_INET,
+
+	.release =	inet_release,
+	.bind =		inet_bind,
+	.connect =	inet_stream_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	inet_accept,
+	.getname =	inet_getname,
+	.poll =		tcp_poll,
+	.ioctl =	inet_ioctl,
+	.listen =	inet_listen,
+	.shutdown =	inet_shutdown,
+	.setsockopt =	inet_setsockopt,
+	.getsockopt =	inet_getsockopt,
+	.sendmsg =	inet_sendmsg,
+	.recvmsg =	inet_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	tcp_sendpage
 };
 
 struct proto_ops inet_dgram_ops = {
-	family:		PF_INET,
-
-	release:	inet_release,
-	bind:		inet_bind,
-	connect:	inet_dgram_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	inet_getname,
-	poll:		datagram_poll,
-	ioctl:		inet_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	inet_shutdown,
-	setsockopt:	inet_setsockopt,
-	getsockopt:	inet_getsockopt,
-	sendmsg:	inet_sendmsg,
-	recvmsg:	inet_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_INET,
+
+	.release =	inet_release,
+	.bind =		inet_bind,
+	.connect =	inet_dgram_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	inet_getname,
+	.poll =		datagram_poll,
+	.ioctl =	inet_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	inet_shutdown,
+	.setsockopt =	inet_setsockopt,
+	.getsockopt =	inet_getsockopt,
+	.sendmsg =	inet_sendmsg,
+	.recvmsg =	inet_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 struct net_proto_family inet_family_ops = {
-	family:	 PF_INET,
-	create:	 inet_create,
+	.family = PF_INET,
+	.create = inet_create,
 };
 
 
@@ -1028,34 +1028,34 @@ extern void tcp_v4_init(struct net_proto_family *);
 static struct inet_protosw inetsw_array[] =
 {
         {
-                type:        SOCK_STREAM,
-                protocol:    IPPROTO_TCP,
-                prot:        &tcp_prot,
-                ops:         &inet_stream_ops,
-                capability:  -1,
-                no_check:    0,
-                flags:       INET_PROTOSW_PERMANENT,
+                .type =       SOCK_STREAM,
+                .protocol =   IPPROTO_TCP,
+                .prot =       &tcp_prot,
+                .ops =        &inet_stream_ops,
+                .capability = -1,
+                .no_check =   0,
+                .flags =      INET_PROTOSW_PERMANENT,
         },
 
         {
-                type:        SOCK_DGRAM,
-                protocol:    IPPROTO_UDP,
-                prot:        &udp_prot,
-                ops:         &inet_dgram_ops,
-                capability:  -1,
-                no_check:    UDP_CSUM_DEFAULT,
-                flags:       INET_PROTOSW_PERMANENT,
+                .type =       SOCK_DGRAM,
+                .protocol =   IPPROTO_UDP,
+                .prot =       &udp_prot,
+                .ops =        &inet_dgram_ops,
+                .capability = -1,
+                .no_check =   UDP_CSUM_DEFAULT,
+                .flags =      INET_PROTOSW_PERMANENT,
        },
         
 
        {
-               type:        SOCK_RAW,
-               protocol:    IPPROTO_IP,	/* wild card */
-               prot:        &raw_prot,
-               ops:         &inet_dgram_ops,
-               capability:  CAP_NET_RAW,
-               no_check:    UDP_CSUM_DEFAULT,
-               flags:       INET_PROTOSW_REUSE,
+               .type =       SOCK_RAW,
+               .protocol =   IPPROTO_IP,	/* wild card */
+               .prot =       &raw_prot,
+               .ops =        &inet_dgram_ops,
+               .capability = CAP_NET_RAW,
+               .no_check =   UDP_CSUM_DEFAULT,
+               .flags =      INET_PROTOSW_REUSE,
        }
 };
 
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index f66b8220474b..a24265d561e5 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -124,70 +124,70 @@ static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb);
 static void parp_redo(struct sk_buff *skb);
 
 static struct neigh_ops arp_generic_ops = {
-	family:			AF_INET,
-	solicit:		arp_solicit,
-	error_report:		arp_error_report,
-	output:			neigh_resolve_output,
-	connected_output:	neigh_connected_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET,
+	.solicit =		arp_solicit,
+	.error_report =		arp_error_report,
+	.output =		neigh_resolve_output,
+	.connected_output =	neigh_connected_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 static struct neigh_ops arp_hh_ops = {
-	family:			AF_INET,
-	solicit:		arp_solicit,
-	error_report:		arp_error_report,
-	output:			neigh_resolve_output,
-	connected_output:	neigh_resolve_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET,
+	.solicit =		arp_solicit,
+	.error_report =		arp_error_report,
+	.output =		neigh_resolve_output,
+	.connected_output =	neigh_resolve_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 static struct neigh_ops arp_direct_ops = {
-	family:			AF_INET,
-	output:			dev_queue_xmit,
-	connected_output:	dev_queue_xmit,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET,
+	.output =		dev_queue_xmit,
+	.connected_output =	dev_queue_xmit,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 struct neigh_ops arp_broken_ops = {
-	family:			AF_INET,
-	solicit:		arp_solicit,
-	error_report:		arp_error_report,
-	output:			neigh_compat_output,
-	connected_output:	neigh_compat_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET,
+	.solicit =		arp_solicit,
+	.error_report =		arp_error_report,
+	.output =		neigh_compat_output,
+	.connected_output =	neigh_compat_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 struct neigh_table arp_tbl = {
-	family:		AF_INET,
-	entry_size:	sizeof(struct neighbour) + 4,
-	key_len:	4,
-	hash:		arp_hash,
-	constructor:	arp_constructor,
-	proxy_redo:	parp_redo,
-	id:		"arp_cache",
-	parms: {
-		tbl:			&arp_tbl,
-		base_reachable_time:	30 * HZ,
-		retrans_time:		1 * HZ,
-		gc_staletime:		60 * HZ,
-		reachable_time:		30 * HZ,
-		delay_probe_time:	5 * HZ,
-		queue_len:		3,
-		ucast_probes:		3,
-		mcast_probes:		3,
-		anycast_delay:		1 * HZ,
-		proxy_delay:		(8 * HZ) / 10,
-		proxy_qlen:		64,
-		locktime:		1 * HZ,
+	.family =	AF_INET,
+	.entry_size =	sizeof(struct neighbour) + 4,
+	.key_len =	4,
+	.hash =		arp_hash,
+	.constructor =	arp_constructor,
+	.proxy_redo =	parp_redo,
+	.id =		"arp_cache",
+	.parms = {
+		.tbl =			&arp_tbl,
+		.base_reachable_time =	30 * HZ,
+		.retrans_time =	1 * HZ,
+		.gc_staletime =	60 * HZ,
+		.reachable_time =		30 * HZ,
+		.delay_probe_time =	5 * HZ,
+		.queue_len =		3,
+		.ucast_probes =	3,
+		.mcast_probes =	3,
+		.anycast_delay =	1 * HZ,
+		.proxy_delay =		(8 * HZ) / 10,
+		.proxy_qlen =		64,
+		.locktime =		1 * HZ,
 	},
-	gc_interval:	30 * HZ,
-	gc_thresh1:	128,
-	gc_thresh2:	512,
-	gc_thresh3:	1024,
+	.gc_interval =	30 * HZ,
+	.gc_thresh1 =	128,
+	.gc_thresh2 =	512,
+	.gc_thresh3 =	1024,
 };
 
 int arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir)
@@ -1180,9 +1180,9 @@ void arp_ifdown(struct net_device *dev)
  */
 
 static struct packet_type arp_packet_type = {
-	type:	__constant_htons(ETH_P_ARP),
-	func:	arp_rcv,
-	data:	(void*) 1, /* understand shared skbs */
+	.type =	__constant_htons(ETH_P_ARP),
+	.func =	arp_rcv,
+	.data =	(void*) 1, /* understand shared skbs */
 };
 
 void __init arp_init (void)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index d831f67bc850..306b15efaa9f 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -62,18 +62,18 @@
 #include <net/ip_fib.h>
 
 struct ipv4_devconf ipv4_devconf = {
-	accept_redirects: 1,
-	send_redirects:	  1,
-	secure_redirects: 1,
-	shared_media:	  1,
+	.accept_redirects = 1,
+	.send_redirects =  1,
+	.secure_redirects = 1,
+	.shared_media =	  1,
 };
 
 static struct ipv4_devconf ipv4_devconf_dflt = {
-	accept_redirects:    1,
-	send_redirects:      1,
-	secure_redirects:    1,
-	shared_media:	     1,
-	accept_source_route: 1,
+	.accept_redirects =  1,
+	.send_redirects =    1,
+	.secure_redirects =  1,
+	.shared_media =	     1,
+	.accept_source_route = 1,
 };
 
 static void rtmsg_ifa(int event, struct in_ifaddr *);
@@ -886,7 +886,7 @@ out:
 }
 
 struct notifier_block ip_netdev_notifier = {
-	notifier_call:	inetdev_event,
+	.notifier_call =inetdev_event,
 };
 
 static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,
@@ -1047,150 +1047,150 @@ static struct devinet_sysctl_table {
 	ctl_table		devinet_proto_dir[2];
 	ctl_table		devinet_root_dir[2];
 } devinet_sysctl = {
-	devinet_vars: {
+	.devinet_vars = {
 		{
-			ctl_name:	NET_IPV4_CONF_FORWARDING,
-			procname:	"forwarding",
-			data:		&ipv4_devconf.forwarding,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&devinet_sysctl_forward,
+			.ctl_name =	NET_IPV4_CONF_FORWARDING,
+			.procname =	"forwarding",
+			.data =	&ipv4_devconf.forwarding,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&devinet_sysctl_forward,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_MC_FORWARDING,
-			procname:	"mc_forwarding",
-			data:		&ipv4_devconf.mc_forwarding,
-			maxlen:		sizeof(int),
-			mode:		0444,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_MC_FORWARDING,
+			.procname =	"mc_forwarding",
+			.data =	&ipv4_devconf.mc_forwarding,
+			.maxlen =		sizeof(int),
+			.mode =	0444,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_ACCEPT_REDIRECTS,
-			procname:	"accept_redirects",
-			data:		&ipv4_devconf.accept_redirects,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_ACCEPT_REDIRECTS,
+			.procname =	"accept_redirects",
+			.data =	&ipv4_devconf.accept_redirects,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_SECURE_REDIRECTS,
-			procname:	"secure_redirects",
-			data:		&ipv4_devconf.secure_redirects,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_SECURE_REDIRECTS,
+			.procname =	"secure_redirects",
+			.data =	&ipv4_devconf.secure_redirects,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_SHARED_MEDIA,
-			procname:	"shared_media",
-			data:		&ipv4_devconf.shared_media,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_SHARED_MEDIA,
+			.procname =	"shared_media",
+			.data =	&ipv4_devconf.shared_media,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_RP_FILTER,
-			procname:	"rp_filter",
-			data:		&ipv4_devconf.rp_filter,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_RP_FILTER,
+			.procname =	"rp_filter",
+			.data =	&ipv4_devconf.rp_filter,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_SEND_REDIRECTS,
-			procname:	"send_redirects",
-			data:		&ipv4_devconf.send_redirects,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_SEND_REDIRECTS,
+			.procname =	"send_redirects",
+			.data =	&ipv4_devconf.send_redirects,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,
-			procname:	"accept_source_route",
-			data:		&ipv4_devconf.accept_source_route,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,
+			.procname =	"accept_source_route",
+			.data =	&ipv4_devconf.accept_source_route,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_PROXY_ARP,
-			procname:	"proxy_arp",
-			data:		&ipv4_devconf.proxy_arp,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_PROXY_ARP,
+			.procname =	"proxy_arp",
+			.data =	&ipv4_devconf.proxy_arp,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_MEDIUM_ID,
-			procname:	"medium_id",
-			data:		&ipv4_devconf.medium_id,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_MEDIUM_ID,
+			.procname =	"medium_id",
+			.data =	&ipv4_devconf.medium_id,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_BOOTP_RELAY,
-			procname:	"bootp_relay",
-			data:		&ipv4_devconf.bootp_relay,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_BOOTP_RELAY,
+			.procname =	"bootp_relay",
+			.data =	&ipv4_devconf.bootp_relay,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_LOG_MARTIANS,
-			procname:	"log_martians",
-			data:		&ipv4_devconf.log_martians,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_LOG_MARTIANS,
+			.procname =	"log_martians",
+			.data =	&ipv4_devconf.log_martians,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_TAG,
-			procname:	"tag",
-			data:		&ipv4_devconf.tag,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_TAG,
+			.procname =	"tag",
+			.data =	&ipv4_devconf.tag,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 		{
-			ctl_name:	NET_IPV4_CONF_ARPFILTER,
-			procname:	"arp_filter",
-			data:		&ipv4_devconf.arp_filter,
-			maxlen:		sizeof(int),
-			mode:		0644,
-			proc_handler:	&proc_dointvec,
+			.ctl_name =	NET_IPV4_CONF_ARPFILTER,
+			.procname =	"arp_filter",
+			.data =	&ipv4_devconf.arp_filter,
+			.maxlen =		sizeof(int),
+			.mode =	0644,
+			.proc_handler =&proc_dointvec,
 		},
 	},
-	devinet_dev: {
+	.devinet_dev = {
 		{
-			ctl_name:	NET_PROTO_CONF_ALL,
-			procname:	"all",
-			mode:		0555,
-			child:		devinet_sysctl.devinet_vars,
+			.ctl_name =	NET_PROTO_CONF_ALL,
+			.procname =	"all",
+			.mode =	0555,
+			.child =		devinet_sysctl.devinet_vars,
 		},
 	},
-	devinet_conf_dir: {
+	.devinet_conf_dir = {
 	        {
-			ctl_name:	NET_IPV4_CONF,
-			procname:	"conf",
-			mode:		0555,
-			child:		devinet_sysctl.devinet_dev,
+			.ctl_name =	NET_IPV4_CONF,
+			.procname =	"conf",
+			.mode =	0555,
+			.child =		devinet_sysctl.devinet_dev,
 		},
 	},
-	devinet_proto_dir: {
+	.devinet_proto_dir = {
 		{
-			ctl_name:	NET_IPV4,
-			procname:	"ipv4",
-			mode:		0555,
-			child:		devinet_sysctl.devinet_conf_dir,
+			.ctl_name =	NET_IPV4,
+			.procname =	"ipv4",
+			.mode =	0555,
+			.child =		devinet_sysctl.devinet_conf_dir,
 		},
 	},
-	devinet_root_dir: {
+	.devinet_root_dir = {
 		{
-			ctl_name:	CTL_NET,
-			procname:	"net",
-			mode:		0555,
-			child:		devinet_sysctl.devinet_proto_dir,
+			.ctl_name =	CTL_NET,
+			.procname =	"net",
+			.mode =	0555,
+			.child =		devinet_sysctl.devinet_proto_dir,
 		},
 	},
 };
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 41b0750dcd21..c101889f0226 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -634,11 +634,11 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
 }
 
 struct notifier_block fib_inetaddr_notifier = {
-	notifier_call:	fib_inetaddr_event,
+	.notifier_call =fib_inetaddr_event,
 };
 
 struct notifier_block fib_netdev_notifier = {
-	notifier_call:	fib_netdev_event,
+	.notifier_call =fib_netdev_event,
 };
 
 void __init ip_fib_init(void)
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 47230c8e451e..8ae6cbeee71e 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -77,25 +77,25 @@ struct fib_rule
 };
 
 static struct fib_rule default_rule = {
-	r_clntref:	ATOMIC_INIT(2),
-	r_preference:	0x7FFF,
-	r_table:	RT_TABLE_DEFAULT,
-	r_action:	RTN_UNICAST,
+	.r_clntref =	ATOMIC_INIT(2),
+	.r_preference =	0x7FFF,
+	.r_table =	RT_TABLE_DEFAULT,
+	.r_action =	RTN_UNICAST,
 };
 
 static struct fib_rule main_rule = {
-	r_next:		&default_rule,
-	r_clntref:	ATOMIC_INIT(2),
-	r_preference:	0x7FFE,
-	r_table:	RT_TABLE_MAIN,
-	r_action:	RTN_UNICAST,
+	.r_next =	&default_rule,
+	.r_clntref =	ATOMIC_INIT(2),
+	.r_preference =	0x7FFE,
+	.r_table =	RT_TABLE_MAIN,
+	.r_action =	RTN_UNICAST,
 };
 
 static struct fib_rule local_rule = {
-	r_next:		&main_rule,
-	r_clntref:	ATOMIC_INIT(2),
-	r_table:	RT_TABLE_LOCAL,
-	r_action:	RTN_UNICAST,
+	.r_next =	&main_rule,
+	.r_clntref =	ATOMIC_INIT(2),
+	.r_table =	RT_TABLE_LOCAL,
+	.r_action =	RTN_UNICAST,
 };
 
 static struct fib_rule *fib_rules = &local_rule;
@@ -392,7 +392,7 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event, voi
 
 
 struct notifier_block fib_rules_notifier = {
-	notifier_call:	fib_rules_event,
+	.notifier_call =fib_rules_event,
 };
 
 static __inline__ int inet_fill_rule(struct sk_buff *skb,
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a1c6c5de3188..5cc69cd27013 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -121,68 +121,68 @@ struct icmp_mib icmp_statistics[NR_CPUS * 2];
 
 struct icmp_err icmp_err_convert[] = {
 	{
-		errno:	ENETUNREACH,	/* ICMP_NET_UNREACH */
-		fatal:	0,
+		.errno =ENETUNREACH,	/* ICMP_NET_UNREACH */
+		.fatal =0,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_HOST_UNREACH */
-		fatal:	0,
+		.errno =EHOSTUNREACH,	/* ICMP_HOST_UNREACH */
+		.fatal =0,
 	},
 	{
-		errno:	ENOPROTOOPT	/* ICMP_PROT_UNREACH */,
-		fatal:	1,
+		.errno =ENOPROTOOPT	/* ICMP_PROT_UNREACH */,
+		.fatal =1,
 	},
 	{
-		errno:	ECONNREFUSED,	/* ICMP_PORT_UNREACH */
-		fatal:	1,
+		.errno =ECONNREFUSED,	/* ICMP_PORT_UNREACH */
+		.fatal =1,
 	},
 	{
-		errno:	EMSGSIZE,	/* ICMP_FRAG_NEEDED */
-		fatal:	0,
+		.errno =EMSGSIZE,	/* ICMP_FRAG_NEEDED */
+		.fatal =0,
 	},
 	{
-		errno:	EOPNOTSUPP,	/* ICMP_SR_FAILED */
-		fatal:	0,
+		.errno =EOPNOTSUPP,	/* ICMP_SR_FAILED */
+		.fatal =0,
 	},
 	{
-		errno:	ENETUNREACH,	/* ICMP_NET_UNKNOWN */
-		fatal:	1,
+		.errno =ENETUNREACH,	/* ICMP_NET_UNKNOWN */
+		.fatal =1,
 	},
 	{
-		errno:	EHOSTDOWN,	/* ICMP_HOST_UNKNOWN */
-		fatal:	1,
+		.errno =EHOSTDOWN,	/* ICMP_HOST_UNKNOWN */
+		.fatal =1,
 	},
 	{
-		errno:	ENONET,		/* ICMP_HOST_ISOLATED */
-		fatal:	1,
+		.errno =ENONET,		/* ICMP_HOST_ISOLATED */
+		.fatal =1,
 	},
 	{
-		errno:	ENETUNREACH,	/* ICMP_NET_ANO	*/
-		fatal:	1,
+		.errno =ENETUNREACH,	/* ICMP_NET_ANO	*/
+		.fatal =1,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_HOST_ANO */
-		fatal:	1,
+		.errno =EHOSTUNREACH,	/* ICMP_HOST_ANO */
+		.fatal =1,
 	},
 	{
-		errno:	ENETUNREACH,	/* ICMP_NET_UNR_TOS */
-		fatal:	0,
+		.errno =ENETUNREACH,	/* ICMP_NET_UNR_TOS */
+		.fatal =0,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_HOST_UNR_TOS */
-		fatal:	0,
+		.errno =EHOSTUNREACH,	/* ICMP_HOST_UNR_TOS */
+		.fatal =0,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_PKT_FILTERED */
-		fatal:	1,
+		.errno =EHOSTUNREACH,	/* ICMP_PKT_FILTERED */
+		.fatal =1,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_PREC_VIOLATION */
-		fatal:	1,
+		.errno =EHOSTUNREACH,	/* ICMP_PREC_VIOLATION */
+		.fatal =1,
 	},
 	{
-		errno:	EHOSTUNREACH,	/* ICMP_PREC_CUTOFF */
-		fatal:	1,
+		.errno =EHOSTUNREACH,	/* ICMP_PREC_CUTOFF */
+		.fatal =1,
 	},
 };
 
@@ -1022,123 +1022,123 @@ error:
 static struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {
 	/* ECHO REPLY (0) */
 	[0] = {
-		output:	 &icmp_statistics[0].IcmpOutEchoReps,
-		input:	 &icmp_statistics[0].IcmpInEchoReps,
-		handler: icmp_discard,
+		.output =	 &icmp_statistics[0].IcmpOutEchoReps,
+		.input = &icmp_statistics[0].IcmpInEchoReps,
+		.handler = icmp_discard,
 	},
 	[1] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	[2] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	/* DEST UNREACH (3) */
 	[3] = {
-		output:	 &icmp_statistics[0].IcmpOutDestUnreachs,
-		input:	 &icmp_statistics[0].IcmpInDestUnreachs,
-		handler: icmp_unreach,
-		error:	 1,
+		.output =	 &icmp_statistics[0].IcmpOutDestUnreachs,
+		.input = &icmp_statistics[0].IcmpInDestUnreachs,
+		.handler = icmp_unreach,
+		.error = 1,
 	},
 	/* SOURCE QUENCH (4) */
 	[4] = {
-		output:	 &icmp_statistics[0].IcmpOutSrcQuenchs,
-		input:	 &icmp_statistics[0].IcmpInSrcQuenchs,
+		.output =	 &icmp_statistics[0].IcmpOutSrcQuenchs,
+		.input = &icmp_statistics[0].IcmpInSrcQuenchs,
 		icmp_unreach,
-		error:	 1,
+		.error = 1,
 	},
 	/* REDIRECT (5) */
 	[5] = {
-		output:	 &icmp_statistics[0].IcmpOutRedirects,
-		input:	 &icmp_statistics[0].IcmpInRedirects,
-		handler: icmp_redirect,
-		error:	 1,
+		.output =	 &icmp_statistics[0].IcmpOutRedirects,
+		.input = &icmp_statistics[0].IcmpInRedirects,
+		.handler = icmp_redirect,
+		.error = 1,
 	},
 	[6] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	[7] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	/* ECHO (8) */
 	[8] = {
-		output:	 &icmp_statistics[0].IcmpOutEchos,
-		input:	 &icmp_statistics[0].IcmpInEchos,
-		handler: icmp_echo,
-		error:	 0,
+		.output =	 &icmp_statistics[0].IcmpOutEchos,
+		.input = &icmp_statistics[0].IcmpInEchos,
+		.handler = icmp_echo,
+		.error = 0,
 	},
 	[9] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	[10] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].IcmpInErrors,
-		handler: icmp_discard,
-		error:	 1,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].IcmpInErrors,
+		.handler = icmp_discard,
+		.error = 1,
 	},
 	/* TIME EXCEEDED (11) */
 	[11] = {
-		output:	 &icmp_statistics[0].IcmpOutTimeExcds,
-		input:	 &icmp_statistics[0].IcmpInTimeExcds,
-		handler: icmp_unreach,
-		error:	 1,
+		.output =	 &icmp_statistics[0].IcmpOutTimeExcds,
+		.input = &icmp_statistics[0].IcmpInTimeExcds,
+		.handler = icmp_unreach,
+		.error = 1,
 	},
 	/* PARAMETER PROBLEM (12) */
 	[12] = {
-		output:	 &icmp_statistics[0].IcmpOutParmProbs,
-		input:	 &icmp_statistics[0].IcmpInParmProbs,
-		handler: icmp_unreach,
-		error:	 1,
+		.output =	 &icmp_statistics[0].IcmpOutParmProbs,
+		.input = &icmp_statistics[0].IcmpInParmProbs,
+		.handler = icmp_unreach,
+		.error = 1,
 	},
 	/* TIMESTAMP (13) */
 	[13] = {
-		output:	 &icmp_statistics[0].IcmpOutTimestamps,
-		input:	 &icmp_statistics[0].IcmpInTimestamps,
-		handler: icmp_timestamp,
+		.output =	 &icmp_statistics[0].IcmpOutTimestamps,
+		.input = &icmp_statistics[0].IcmpInTimestamps,
+		.handler = icmp_timestamp,
 	},
 	/* TIMESTAMP REPLY (14) */
 	[14] = {
-		output:	 &icmp_statistics[0].IcmpOutTimestampReps,
-		input:	 &icmp_statistics[0].IcmpInTimestampReps,
-		handler: icmp_discard,
+		.output =	 &icmp_statistics[0].IcmpOutTimestampReps,
+		.input = &icmp_statistics[0].IcmpInTimestampReps,
+		.handler = icmp_discard,
 	},
 	/* INFO (15) */
 	[15] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].dummy,
-		handler: icmp_discard,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].dummy,
+		.handler = icmp_discard,
 	},
 	/* INFO REPLY (16) */
  	[16] = {
-		output:	 &icmp_statistics[0].dummy,
-		input:	 &icmp_statistics[0].dummy,
-		handler: icmp_discard,
+		.output =	 &icmp_statistics[0].dummy,
+		.input = &icmp_statistics[0].dummy,
+		.handler = icmp_discard,
 	},
 	/* ADDR MASK (17) */
 	[17] = {
-		output:	 &icmp_statistics[0].IcmpOutAddrMasks,
-		input:	 &icmp_statistics[0].IcmpInAddrMasks,
-		handler: icmp_address,
+		.output =	 &icmp_statistics[0].IcmpOutAddrMasks,
+		.input = &icmp_statistics[0].IcmpInAddrMasks,
+		.handler = icmp_address,
 	},
 	/* ADDR MASK REPLY (18) */
 	[18] = {
-		output:	 &icmp_statistics[0].IcmpOutAddrMaskReps,
-		input:	 &icmp_statistics[0].IcmpInAddrMaskReps,
-		handler: icmp_address_reply,
+		.output =	 &icmp_statistics[0].IcmpOutAddrMaskReps,
+		.input = &icmp_statistics[0].IcmpInAddrMaskReps,
+		.handler = icmp_address_reply,
 	}
 };
 
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index cf5c0b253cdb..48d1064ffabe 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -120,13 +120,13 @@ static int ipgre_tunnel_init(struct net_device *dev);
 static int ipgre_fb_tunnel_init(struct net_device *dev);
 
 static struct net_device ipgre_fb_tunnel_dev = {
-	name:	"gre0",
-	init:	ipgre_fb_tunnel_init
+	.name =	"gre0",
+	.init =	ipgre_fb_tunnel_init
 };
 
 static struct ip_tunnel ipgre_fb_tunnel = {
-	dev:	&ipgre_fb_tunnel_dev,
-	parms:	{ name: "gre0" }
+	.dev =	&ipgre_fb_tunnel_dev,
+	.parms ={ name: "gre0" }
 };
 
 /* Tunnel hash table */
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4ee3ed1be090..2d128cd3947a 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -382,8 +382,8 @@ static int __init ic_defaults(void)
 static int ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt);
 
 static struct packet_type rarp_packet_type __initdata = {
-	type:	__constant_htons(ETH_P_RARP),
-	func:	ic_rarp_recv,
+	.type =	__constant_htons(ETH_P_RARP),
+	.func =	ic_rarp_recv,
 };
 
 static inline void ic_rarp_init(void)
@@ -522,8 +522,8 @@ struct bootp_pkt {		/* BOOTP packet format */
 static int ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt);
 
 static struct packet_type bootp_packet_type __initdata = {
-	type:	__constant_htons(ETH_P_IP),
-	func:	ic_bootp_recv,
+	.type =	__constant_htons(ETH_P_IP),
+	.func =	ic_bootp_recv,
 };
 
 
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 82634df7c6fe..a8fa8e86e673 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -123,13 +123,13 @@ static int ipip_fb_tunnel_init(struct net_device *dev);
 static int ipip_tunnel_init(struct net_device *dev);
 
 static struct net_device ipip_fb_tunnel_dev = {
-	name:	"tunl0",
-	init:	ipip_fb_tunnel_init,
+	.name =	"tunl0",
+	.init =	ipip_fb_tunnel_init,
 };
 
 static struct ip_tunnel ipip_fb_tunnel = {
-	dev:	&ipip_fb_tunnel_dev,
-	parms:	{ name:	"tunl0", }
+	.dev =	&ipip_fb_tunnel_dev,
+	.parms ={ name:	"tunl0", }
 };
 
 static struct ip_tunnel *tunnels_r_l[HASH_SIZE];
@@ -877,10 +877,10 @@ int __init ipip_fb_tunnel_init(struct net_device *dev)
 }
 
 static struct inet_protocol ipip_protocol = {
-	handler:	ipip_rcv,
-	err_handler:	ipip_err,
-	protocol:	IPPROTO_IPIP,
-	name:		"IPIP"
+	.handler =	ipip_rcv,
+	.err_handler =	ipip_err,
+	.protocol =	IPPROTO_IPIP,
+	.name =		"IPIP"
 };
 
 static char banner[] __initdata =
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c
index a379decd8311..e04d1ff5fc47 100644
--- a/net/ipv4/protocol.c
+++ b/net/ipv4/protocol.c
@@ -53,10 +53,10 @@
 #ifdef CONFIG_IP_MULTICAST
 
 static struct inet_protocol igmp_protocol = {
-	handler:	igmp_rcv,
-	next:		IPPROTO_PREVIOUS,
-	protocol:	IPPROTO_IGMP,
-	name:		"IGMP"
+	.handler =	igmp_rcv,
+	.next =		IPPROTO_PREVIOUS,
+	.protocol =	IPPROTO_IGMP,
+	.name =		"IGMP"
 };
 
 #undef  IPPROTO_PREVIOUS
@@ -65,32 +65,32 @@ static struct inet_protocol igmp_protocol = {
 #endif
 
 static struct inet_protocol tcp_protocol = {
-	handler:	tcp_v4_rcv,
-	err_handler:	tcp_v4_err,
-	next:		IPPROTO_PREVIOUS,
-	protocol:	IPPROTO_TCP,
-	name:		"TCP"
+	.handler =	tcp_v4_rcv,
+	.err_handler =	tcp_v4_err,
+	.next =		IPPROTO_PREVIOUS,
+	.protocol =	IPPROTO_TCP,
+	.name =		"TCP"
 };
 
 #undef  IPPROTO_PREVIOUS
 #define IPPROTO_PREVIOUS &tcp_protocol
 
 static struct inet_protocol udp_protocol = {
-	handler:	udp_rcv,
-	err_handler:	udp_err,
-	next:		IPPROTO_PREVIOUS,
-	protocol:	IPPROTO_UDP,
-	name:		"UDP"
+	.handler =	udp_rcv,
+	.err_handler =	udp_err,
+	.next =		IPPROTO_PREVIOUS,
+	.protocol =	IPPROTO_UDP,
+	.name =		"UDP"
 };
 
 #undef  IPPROTO_PREVIOUS
 #define IPPROTO_PREVIOUS &udp_protocol
 
 static struct inet_protocol icmp_protocol = {
-	handler:	icmp_rcv,
-	next:		IPPROTO_PREVIOUS,
-	protocol:	IPPROTO_ICMP,
-	name:		"ICMP"
+	.handler =	icmp_rcv,
+	.next =		IPPROTO_PREVIOUS,
+	.protocol =	IPPROTO_ICMP,
+	.name =		"ICMP"
 };
 
 #undef  IPPROTO_PREVIOUS
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 107267695d83..fb041f49ed9d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -688,18 +688,18 @@ out:
 }
 
 struct proto raw_prot = {
-	name:		"RAW",
-	close:		raw_close,
-	connect:	udp_connect,
-	disconnect:	udp_disconnect,
-	ioctl:		raw_ioctl,
-	init:		raw_init,
-	setsockopt:	raw_setsockopt,
-	getsockopt:	raw_getsockopt,
-	sendmsg:	raw_sendmsg,
-	recvmsg:	raw_recvmsg,
-	bind:		raw_bind,
-	backlog_rcv:	raw_rcv_skb,
-	hash:		raw_v4_hash,
-	unhash:		raw_v4_unhash,
+	.name =		"RAW",
+	.close =	raw_close,
+	.connect =	udp_connect,
+	.disconnect =	udp_disconnect,
+	.ioctl =	raw_ioctl,
+	.init =		raw_init,
+	.setsockopt =	raw_setsockopt,
+	.getsockopt =	raw_getsockopt,
+	.sendmsg =	raw_sendmsg,
+	.recvmsg =	raw_recvmsg,
+	.bind =		raw_bind,
+	.backlog_rcv =	raw_rcv_skb,
+	.hash =		raw_v4_hash,
+	.unhash =	raw_v4_unhash,
 };
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 464a56367e28..8bbcfff78e42 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -139,15 +139,15 @@ static int rt_garbage_collect(void);
 
 
 struct dst_ops ipv4_dst_ops = {
-	family:			AF_INET,
-	protocol:		__constant_htons(ETH_P_IP),
-	gc:			rt_garbage_collect,
-	check:			ipv4_dst_check,
-	reroute:		ipv4_dst_reroute,
-	destroy:		ipv4_dst_destroy,
-	negative_advice:	ipv4_negative_advice,
-	link_failure:		ipv4_link_failure,
-	entry_size:		sizeof(struct rtable),
+	.family =		AF_INET,
+	.protocol =		__constant_htons(ETH_P_IP),
+	.gc =			rt_garbage_collect,
+	.check =		ipv4_dst_check,
+	.reroute =		ipv4_dst_reroute,
+	.destroy =		ipv4_dst_destroy,
+	.negative_advice =	ipv4_negative_advice,
+	.link_failure =		ipv4_link_failure,
+	.entry_size =		sizeof(struct rtable),
 };
 
 #define ECN_OR_COST(class)	TC_PRIO_##class
@@ -2267,147 +2267,147 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, int *name,
 
 ctl_table ipv4_route_table[] = {
         {
-		ctl_name:	NET_IPV4_ROUTE_FLUSH,
-		procname:	"flush",
-		data:		&flush_delay,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&ipv4_sysctl_rtcache_flush,
-		strategy:	&ipv4_sysctl_rtcache_flush_strategy,
+		.ctl_name =	NET_IPV4_ROUTE_FLUSH,
+		.procname =	"flush",
+		.data =	&flush_delay,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&ipv4_sysctl_rtcache_flush,
+		.strategy =	&ipv4_sysctl_rtcache_flush_strategy,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MIN_DELAY,
-		procname:	"min_delay",
-		data:		&ip_rt_min_delay,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_MIN_DELAY,
+		.procname =	"min_delay",
+		.data =	&ip_rt_min_delay,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MAX_DELAY,
-		procname:	"max_delay",
-		data:		&ip_rt_max_delay,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_MAX_DELAY,
+		.procname =	"max_delay",
+		.data =	&ip_rt_max_delay,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_GC_THRESH,
-		procname:	"gc_thresh",
-		data:		&ipv4_dst_ops.gc_thresh,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_GC_THRESH,
+		.procname =	"gc_thresh",
+		.data =	&ipv4_dst_ops.gc_thresh,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MAX_SIZE,
-		procname:	"max_size",
-		data:		&ip_rt_max_size,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_MAX_SIZE,
+		.procname =	"max_size",
+		.data =	&ip_rt_max_size,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_GC_MIN_INTERVAL,
-		procname:	"gc_min_interval",
-		data:		&ip_rt_gc_min_interval,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_GC_MIN_INTERVAL,
+		.procname =	"gc_min_interval",
+		.data =	&ip_rt_gc_min_interval,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_GC_TIMEOUT,
-		procname:	"gc_timeout",
-		data:		&ip_rt_gc_timeout,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_GC_TIMEOUT,
+		.procname =	"gc_timeout",
+		.data =	&ip_rt_gc_timeout,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_GC_INTERVAL,
-		procname:	"gc_interval",
-		data:		&ip_rt_gc_interval,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_GC_INTERVAL,
+		.procname =	"gc_interval",
+		.data =	&ip_rt_gc_interval,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_REDIRECT_LOAD,
-		procname:	"redirect_load",
-		data:		&ip_rt_redirect_load,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_LOAD,
+		.procname =	"redirect_load",
+		.data =	&ip_rt_redirect_load,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_REDIRECT_NUMBER,
-		procname:	"redirect_number",
-		data:		&ip_rt_redirect_number,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_NUMBER,
+		.procname =	"redirect_number",
+		.data =	&ip_rt_redirect_number,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_REDIRECT_SILENCE,
-		procname:	"redirect_silence",
-		data:		&ip_rt_redirect_silence,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_SILENCE,
+		.procname =	"redirect_silence",
+		.data =	&ip_rt_redirect_silence,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_ERROR_COST,
-		procname:	"error_cost",
-		data:		&ip_rt_error_cost,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_ERROR_COST,
+		.procname =	"error_cost",
+		.data =	&ip_rt_error_cost,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_ERROR_BURST,
-		procname:	"error_burst",
-		data:		&ip_rt_error_burst,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_ERROR_BURST,
+		.procname =	"error_burst",
+		.data =	&ip_rt_error_burst,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_GC_ELASTICITY,
-		procname:	"gc_elasticity",
-		data:		&ip_rt_gc_elasticity,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_GC_ELASTICITY,
+		.procname =	"gc_elasticity",
+		.data =	&ip_rt_gc_elasticity,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MTU_EXPIRES,
-		procname:	"mtu_expires",
-		data:		&ip_rt_mtu_expires,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec_jiffies,
-		strategy:	&sysctl_jiffies,
+		.ctl_name =	NET_IPV4_ROUTE_MTU_EXPIRES,
+		.procname =	"mtu_expires",
+		.data =	&ip_rt_mtu_expires,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec_jiffies,
+		.strategy =	&sysctl_jiffies,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MIN_PMTU,
-		procname:	"min_pmtu",
-		data:		&ip_rt_min_pmtu,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_MIN_PMTU,
+		.procname =	"min_pmtu",
+		.data =	&ip_rt_min_pmtu,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	{
-		ctl_name:	NET_IPV4_ROUTE_MIN_ADVMSS,
-		procname:	"min_adv_mss",
-		data:		&ip_rt_min_advmss,
-		maxlen:		sizeof(int),
-		mode:		0644,
-		proc_handler:	&proc_dointvec,
+		.ctl_name =	NET_IPV4_ROUTE_MIN_ADVMSS,
+		.procname =	"min_adv_mss",
+		.data =	&ip_rt_min_advmss,
+		.maxlen =		sizeof(int),
+		.mode =	0644,
+		.proc_handler =&proc_dointvec,
 	},
 	 { 0 }
 };
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b3065b9707a0..4386163ca3af 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -79,11 +79,11 @@ void tcp_v4_send_check(struct sock *sk, struct tcphdr *th, int len,
 		       struct sk_buff *skb);
 
 struct tcp_hashinfo __cacheline_aligned tcp_hashinfo = {
-	__tcp_lhash_lock:     RW_LOCK_UNLOCKED,
-	__tcp_lhash_users:    ATOMIC_INIT(0),
+	.__tcp_lhash_lock =   RW_LOCK_UNLOCKED,
+	.__tcp_lhash_users =  ATOMIC_INIT(0),
 	__tcp_lhash_wait:
 	  __WAIT_QUEUE_HEAD_INITIALIZER(tcp_hashinfo.__tcp_lhash_wait),
-	__tcp_portalloc_lock: SPIN_LOCK_UNLOCKED
+	.__tcp_portalloc_lock = SPIN_LOCK_UNLOCKED
 };
 
 /*
@@ -1379,11 +1379,11 @@ static inline struct ip_options *tcp_v4_save_options(struct sock *sk,
 int sysctl_max_syn_backlog = 256;
 
 struct or_calltable or_ipv4 = {
-	family:		PF_INET,
-	rtx_syn_ack:	tcp_v4_send_synack,
-	send_ack:	tcp_v4_or_send_ack,
-	destructor:	tcp_v4_or_free,
-	send_reset:	tcp_v4_send_reset,
+	.family =	PF_INET,
+	.rtx_syn_ack =	tcp_v4_send_synack,
+	.send_ack =	tcp_v4_or_send_ack,
+	.destructor =	tcp_v4_or_free,
+	.send_reset =	tcp_v4_send_reset,
 };
 
 int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
@@ -1998,17 +1998,17 @@ int tcp_v4_tw_remember_stamp(struct tcp_tw_bucket *tw)
 }
 
 struct tcp_func ipv4_specific = {
-	queue_xmit:	ip_queue_xmit,
-	send_check:	tcp_v4_send_check,
-	rebuild_header:	tcp_v4_rebuild_header,
-	conn_request:	tcp_v4_conn_request,
-	syn_recv_sock:	tcp_v4_syn_recv_sock,
-	remember_stamp:	tcp_v4_remember_stamp,
-	net_header_len:	sizeof(struct iphdr),
-	setsockopt:	ip_setsockopt,
-	getsockopt:	ip_getsockopt,
-	addr2sockaddr:	v4_addr2sockaddr,
-	sockaddr_len:	sizeof(struct sockaddr_in),
+	.queue_xmit =	ip_queue_xmit,
+	.send_check =	tcp_v4_send_check,
+	.rebuild_header =tcp_v4_rebuild_header,
+	.conn_request =	tcp_v4_conn_request,
+	.syn_recv_sock =tcp_v4_syn_recv_sock,
+	.remember_stamp =tcp_v4_remember_stamp,
+	.net_header_len =sizeof(struct iphdr),
+	.setsockopt =	ip_setsockopt,
+	.getsockopt =	ip_getsockopt,
+	.addr2sockaddr =v4_addr2sockaddr,
+	.sockaddr_len =	sizeof(struct sockaddr_in),
 };
 
 /* NOTE: A lot of things set to zero explicitly by call to
@@ -2305,23 +2305,23 @@ out_no_bh:
 }
 
 struct proto tcp_prot = {
-	name:		"TCP",
-	close:		tcp_close,
-	connect:	tcp_v4_connect,
-	disconnect:	tcp_disconnect,
-	accept:		tcp_accept,
-	ioctl:		tcp_ioctl,
-	init:		tcp_v4_init_sock,
-	destroy:	tcp_v4_destroy_sock,
-	shutdown:	tcp_shutdown,
-	setsockopt:	tcp_setsockopt,
-	getsockopt:	tcp_getsockopt,
-	sendmsg:	tcp_sendmsg,
-	recvmsg:	tcp_recvmsg,
-	backlog_rcv:	tcp_v4_do_rcv,
-	hash:		tcp_v4_hash,
-	unhash:		tcp_unhash,
-	get_port:	tcp_v4_get_port,
+	.name =		"TCP",
+	.close =	tcp_close,
+	.connect =	tcp_v4_connect,
+	.disconnect =	tcp_disconnect,
+	.accept =	tcp_accept,
+	.ioctl =	tcp_ioctl,
+	.init =		tcp_v4_init_sock,
+	.destroy =	tcp_v4_destroy_sock,
+	.shutdown =	tcp_shutdown,
+	.setsockopt =	tcp_setsockopt,
+	.getsockopt =	tcp_getsockopt,
+	.sendmsg =	tcp_sendmsg,
+	.recvmsg =	tcp_recvmsg,
+	.backlog_rcv =	tcp_v4_do_rcv,
+	.hash =		tcp_v4_hash,
+	.unhash =	tcp_unhash,
+	.get_port =	tcp_v4_get_port,
 };
 
 
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index c67ea0c1191b..04fbbc04f53b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1039,17 +1039,17 @@ out:
 }
 
 struct proto udp_prot = {
- 	name:		"UDP",
-	close:		udp_close,
-	connect:	udp_connect,
-	disconnect:	udp_disconnect,
-	ioctl:		udp_ioctl,
-	setsockopt:	ip_setsockopt,
-	getsockopt:	ip_getsockopt,
-	sendmsg:	udp_sendmsg,
-	recvmsg:	udp_recvmsg,
-	backlog_rcv:	udp_queue_rcv_skb,
-	hash:		udp_v4_hash,
-	unhash:		udp_v4_unhash,
-	get_port:	udp_v4_get_port,
+ 	.name =		"UDP",
+	.close =	udp_close,
+	.connect =	udp_connect,
+	.disconnect =	udp_disconnect,
+	.ioctl =	udp_ioctl,
+	.setsockopt =	ip_setsockopt,
+	.getsockopt =	ip_getsockopt,
+	.sendmsg =	udp_sendmsg,
+	.recvmsg =	udp_recvmsg,
+	.backlog_rcv =	udp_queue_rcv_skb,
+	.hash =		udp_v4_hash,
+	.unhash =	udp_v4_unhash,
+	.get_port =	udp_v4_get_port,
 };
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index ef18c7f59ffb..fbe45634e28b 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -506,50 +506,50 @@ static int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 
 struct proto_ops inet6_stream_ops = {
-	family:		PF_INET6,
-
-	release:	inet6_release,
-	bind:		inet6_bind,
-	connect:	inet_stream_connect,		/* ok		*/
-	socketpair:	sock_no_socketpair,		/* a do nothing	*/
-	accept:		inet_accept,			/* ok		*/
-	getname:	inet6_getname, 
-	poll:		tcp_poll,			/* ok		*/
-	ioctl:		inet6_ioctl,			/* must change  */
-	listen:		inet_listen,			/* ok		*/
-	shutdown:	inet_shutdown,			/* ok		*/
-	setsockopt:	inet_setsockopt,		/* ok		*/
-	getsockopt:	inet_getsockopt,		/* ok		*/
-	sendmsg:	inet_sendmsg,			/* ok		*/
-	recvmsg:	inet_recvmsg,			/* ok		*/
-	mmap:		sock_no_mmap,
-	sendpage:	tcp_sendpage
+	.family =	PF_INET6,
+
+	.release =	inet6_release,
+	.bind =		inet6_bind,
+	.connect =	inet_stream_connect,		/* ok		*/
+	.socketpair =	sock_no_socketpair,		/* a do nothing	*/
+	.accept =	inet_accept,			/* ok		*/
+	.getname =	inet6_getname, 
+	.poll =		tcp_poll,			/* ok		*/
+	.ioctl =	inet6_ioctl,			/* must change  */
+	.listen =	inet_listen,			/* ok		*/
+	.shutdown =	inet_shutdown,			/* ok		*/
+	.setsockopt =	inet_setsockopt,		/* ok		*/
+	.getsockopt =	inet_getsockopt,		/* ok		*/
+	.sendmsg =	inet_sendmsg,			/* ok		*/
+	.recvmsg =	inet_recvmsg,			/* ok		*/
+	.mmap =		sock_no_mmap,
+	.sendpage =	tcp_sendpage
 };
 
 struct proto_ops inet6_dgram_ops = {
-	family:		PF_INET6,
-
-	release:	inet6_release,
-	bind:		inet6_bind,
-	connect:	inet_dgram_connect,		/* ok		*/
-	socketpair:	sock_no_socketpair,		/* a do nothing	*/
-	accept:		sock_no_accept,			/* a do nothing	*/
-	getname:	inet6_getname, 
-	poll:		datagram_poll,			/* ok		*/
-	ioctl:		inet6_ioctl,			/* must change  */
-	listen:		sock_no_listen,			/* ok		*/
-	shutdown:	inet_shutdown,			/* ok		*/
-	setsockopt:	inet_setsockopt,		/* ok		*/
-	getsockopt:	inet_getsockopt,		/* ok		*/
-	sendmsg:	inet_sendmsg,			/* ok		*/
-	recvmsg:	inet_recvmsg,			/* ok		*/
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_INET6,
+
+	.release =	inet6_release,
+	.bind =		inet6_bind,
+	.connect =	inet_dgram_connect,		/* ok		*/
+	.socketpair =	sock_no_socketpair,		/* a do nothing	*/
+	.accept =	sock_no_accept,			/* a do nothing	*/
+	.getname =	inet6_getname, 
+	.poll =		datagram_poll,			/* ok		*/
+	.ioctl =	inet6_ioctl,			/* must change  */
+	.listen =	sock_no_listen,			/* ok		*/
+	.shutdown =	inet_shutdown,			/* ok		*/
+	.setsockopt =	inet_setsockopt,		/* ok		*/
+	.getsockopt =	inet_getsockopt,		/* ok		*/
+	.sendmsg =	inet_sendmsg,			/* ok		*/
+	.recvmsg =	inet_recvmsg,			/* ok		*/
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 static struct net_proto_family inet6_family_ops = {
-	family:	PF_INET6,
-	create:	inet6_create,
+	.family =PF_INET6,
+	.create =inet6_create,
 };
 
 #ifdef MODULE
@@ -567,13 +567,13 @@ extern void ipv6_sysctl_unregister(void);
 #endif
 
 static struct inet_protosw rawv6_protosw = {
-	type:        SOCK_RAW,
-	protocol:    IPPROTO_IP,	/* wild card */
-	prot:        &rawv6_prot,
-	ops:         &inet6_dgram_ops,
-	capability:  CAP_NET_RAW,
-	no_check:    UDP_CSUM_DEFAULT,
-	flags:       INET_PROTOSW_REUSE,
+	.type =      SOCK_RAW,
+	.protocol =  IPPROTO_IP,	/* wild card */
+	.prot =      &rawv6_prot,
+	.ops =       &inet6_dgram_ops,
+	.capability =CAP_NET_RAW,
+	.no_check =  UDP_CSUM_DEFAULT,
+	.flags =     INET_PROTOSW_REUSE,
 };
 
 #define INETSW6_ARRAY_LEN (sizeof(inetsw6_array) / sizeof(struct inet_protosw))
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 3724b0fe42db..3f26f406029a 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -85,62 +85,62 @@ static void pndisc_destructor(struct pneigh_entry *n);
 static void pndisc_redo(struct sk_buff *skb);
 
 static struct neigh_ops ndisc_generic_ops = {
-	family:			AF_INET6,
-	solicit:		ndisc_solicit,
-	error_report:		ndisc_error_report,
-	output:			neigh_resolve_output,
-	connected_output:	neigh_connected_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET6,
+	.solicit =		ndisc_solicit,
+	.error_report =		ndisc_error_report,
+	.output =		neigh_resolve_output,
+	.connected_output =	neigh_connected_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 static struct neigh_ops ndisc_hh_ops = {
-	family:			AF_INET6,
-	solicit:		ndisc_solicit,
-	error_report:		ndisc_error_report,
-	output:			neigh_resolve_output,
-	connected_output:	neigh_resolve_output,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET6,
+	.solicit =		ndisc_solicit,
+	.error_report =		ndisc_error_report,
+	.output =		neigh_resolve_output,
+	.connected_output =	neigh_resolve_output,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 
 static struct neigh_ops ndisc_direct_ops = {
-	family:			AF_INET6,
-	output:			dev_queue_xmit,
-	connected_output:	dev_queue_xmit,
-	hh_output:		dev_queue_xmit,
-	queue_xmit:		dev_queue_xmit,
+	.family =		AF_INET6,
+	.output =		dev_queue_xmit,
+	.connected_output =	dev_queue_xmit,
+	.hh_output =		dev_queue_xmit,
+	.queue_xmit =		dev_queue_xmit,
 };
 
 struct neigh_table nd_tbl = {
-	family:		AF_INET6,
-	entry_size:	sizeof(struct neighbour) + sizeof(struct in6_addr),
-	key_len:	sizeof(struct in6_addr),
-	hash:		ndisc_hash,
-	constructor:	ndisc_constructor,
-	pconstructor:	pndisc_constructor,
-	pdestructor:	pndisc_destructor,
-	proxy_redo:	pndisc_redo,
-	id:		"ndisc_cache",
-	parms: {
-		tbl:			&nd_tbl,
-		base_reachable_time:	30 * HZ,
-		retrans_time:		 1 * HZ,
-		gc_staletime:		60 * HZ,
-		reachable_time:		30 * HZ,
-		delay_probe_time:	 5 * HZ,
-		queue_len:		 3,
-		ucast_probes:		 3,
-		mcast_probes:		 3,
-		anycast_delay:		 1 * HZ,
-		proxy_delay:		(8 * HZ) / 10,
-		proxy_qlen:		64,
+	.family =	AF_INET6,
+	.entry_size =	sizeof(struct neighbour) + sizeof(struct in6_addr),
+	.key_len =	sizeof(struct in6_addr),
+	.hash =		ndisc_hash,
+	.constructor =	ndisc_constructor,
+	.pconstructor =	pndisc_constructor,
+	.pdestructor =	pndisc_destructor,
+	.proxy_redo =	pndisc_redo,
+	.id =		"ndisc_cache",
+	.parms = {
+		.tbl =			&nd_tbl,
+		.base_reachable_time =	30 * HZ,
+		.retrans_time =	 1 * HZ,
+		.gc_staletime =	60 * HZ,
+		.reachable_time =		30 * HZ,
+		.delay_probe_time =	 5 * HZ,
+		.queue_len =		 3,
+		.ucast_probes =	 3,
+		.mcast_probes =	 3,
+		.anycast_delay =	 1 * HZ,
+		.proxy_delay =		(8 * HZ) / 10,
+		.proxy_qlen =		64,
 	},
-	gc_interval:	  30 * HZ,
-	gc_thresh1:	 128,
-	gc_thresh2:	 512,
-	gc_thresh3:	1024,
+	.gc_interval =	  30 * HZ,
+	.gc_thresh1 =	 128,
+	.gc_thresh2 =	 512,
+	.gc_thresh3 =	1024,
 };
 
 #define NDISC_OPT_SPACE(len) (((len)+2+7)&~7)
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 893adf62be23..c4f58dcf827c 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -912,19 +912,19 @@ out:
 }
 
 struct proto rawv6_prot = {
-	name:		"RAW",
-	close:		rawv6_close,
-	connect:	udpv6_connect,
-	disconnect:	udp_disconnect,
-	ioctl:		rawv6_ioctl,
-	init:		rawv6_init_sk,
-	destroy:	inet6_destroy_sock,
-	setsockopt:	rawv6_setsockopt,
-	getsockopt:	rawv6_getsockopt,
-	sendmsg:	rawv6_sendmsg,
-	recvmsg:	rawv6_recvmsg,
-	bind:		rawv6_bind,
-	backlog_rcv:	rawv6_rcv_skb,
-	hash:		raw_v6_hash,
-	unhash:		raw_v6_unhash,
+	.name =		"RAW",
+	.close =	rawv6_close,
+	.connect =	udpv6_connect,
+	.disconnect =	udp_disconnect,
+	.ioctl =	rawv6_ioctl,
+	.init =		rawv6_init_sk,
+	.destroy =	inet6_destroy_sock,
+	.setsockopt =	rawv6_setsockopt,
+	.getsockopt =	rawv6_getsockopt,
+	.sendmsg =	rawv6_sendmsg,
+	.recvmsg =	rawv6_recvmsg,
+	.bind =		rawv6_bind,
+	.backlog_rcv =	rawv6_rcv_skb,
+	.hash =		raw_v6_hash,
+	.unhash =	raw_v6_unhash,
 };
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 693d8fbb91b9..223c8dbbac95 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -64,8 +64,8 @@ static int ipip6_fb_tunnel_init(struct net_device *dev);
 static int ipip6_tunnel_init(struct net_device *dev);
 
 static struct net_device ipip6_fb_tunnel_dev = {
-	name: "sit0",
-	init: ipip6_fb_tunnel_init
+	.name = "sit0",
+	.init = ipip6_fb_tunnel_init
 };
 
 static struct ip_tunnel ipip6_fb_tunnel = {
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 897d106fbd34..141dd70cdadd 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2137,43 +2137,43 @@ out_no_bh:
 }
 
 struct proto tcpv6_prot = {
-	name:		"TCPv6",
-	close:		tcp_close,
-	connect:	tcp_v6_connect,
-	disconnect:	tcp_disconnect,
-	accept:		tcp_accept,
-	ioctl:		tcp_ioctl,
-	init:		tcp_v6_init_sock,
-	destroy:	tcp_v6_destroy_sock,
-	shutdown:	tcp_shutdown,
-	setsockopt:	tcp_setsockopt,
-	getsockopt:	tcp_getsockopt,
-	sendmsg:	tcp_sendmsg,
-	recvmsg:	tcp_recvmsg,
-	backlog_rcv:	tcp_v6_do_rcv,
-	hash:		tcp_v6_hash,
-	unhash:		tcp_unhash,
-	get_port:	tcp_v6_get_port,
+	.name =		"TCPv6",
+	.close =	tcp_close,
+	.connect =	tcp_v6_connect,
+	.disconnect =	tcp_disconnect,
+	.accept =	tcp_accept,
+	.ioctl =	tcp_ioctl,
+	.init =		tcp_v6_init_sock,
+	.destroy =	tcp_v6_destroy_sock,
+	.shutdown =	tcp_shutdown,
+	.setsockopt =	tcp_setsockopt,
+	.getsockopt =	tcp_getsockopt,
+	.sendmsg =	tcp_sendmsg,
+	.recvmsg =	tcp_recvmsg,
+	.backlog_rcv =	tcp_v6_do_rcv,
+	.hash =		tcp_v6_hash,
+	.unhash =	tcp_unhash,
+	.get_port =	tcp_v6_get_port,
 };
 
 static struct inet6_protocol tcpv6_protocol =
 {
-	handler:	tcp_v6_rcv,
-	err_handler:	tcp_v6_err,
-	protocol:	IPPROTO_TCP,
-	name:		"TCPv6",
+	.handler =	tcp_v6_rcv,
+	.err_handler =	tcp_v6_err,
+	.protocol =	IPPROTO_TCP,
+	.name =		"TCPv6",
 };
 
 extern struct proto_ops inet6_stream_ops;
 
 static struct inet_protosw tcpv6_protosw = {
-	type:        SOCK_STREAM,
-	protocol:    IPPROTO_TCP,
-	prot:        &tcpv6_prot,
-	ops:         &inet6_stream_ops,
-	capability:  -1,
-	no_check:    0,
-	flags:       INET_PROTOSW_PERMANENT,
+	.type =      SOCK_STREAM,
+	.protocol =  IPPROTO_TCP,
+	.prot =      &tcpv6_prot,
+	.ops =       &inet6_stream_ops,
+	.capability =-1,
+	.no_check =  0,
+	.flags =     INET_PROTOSW_PERMANENT,
 };
 
 void __init tcpv6_init(void)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 988fa8b0ca40..245b3a78c18b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -905,10 +905,10 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen)
 }
 
 static struct inet6_protocol udpv6_protocol = {
-	handler:	udpv6_rcv,
-	err_handler:	udpv6_err,
-	protocol:	IPPROTO_UDP,
-	name:		"UDPv6",
+	.handler =	udpv6_rcv,
+	.err_handler =	udpv6_err,
+	.protocol =	IPPROTO_UDP,
+	.name =		"UDPv6",
 };
 
 #define LINE_LEN 190
@@ -987,32 +987,32 @@ out:
 }
 
 struct proto udpv6_prot = {
-	name:		"UDP",
-	close:		udpv6_close,
-	connect:	udpv6_connect,
-	disconnect:	udp_disconnect,
-	ioctl:		udp_ioctl,
-	destroy:	inet6_destroy_sock,
-	setsockopt:	ipv6_setsockopt,
-	getsockopt:	ipv6_getsockopt,
-	sendmsg:	udpv6_sendmsg,
-	recvmsg:	udpv6_recvmsg,
-	backlog_rcv:	udpv6_queue_rcv_skb,
-	hash:		udp_v6_hash,
-	unhash:		udp_v6_unhash,
-	get_port:	udp_v6_get_port,
+	.name =		"UDP",
+	.close =	udpv6_close,
+	.connect =	udpv6_connect,
+	.disconnect =	udp_disconnect,
+	.ioctl =	udp_ioctl,
+	.destroy =	inet6_destroy_sock,
+	.setsockopt =	ipv6_setsockopt,
+	.getsockopt =	ipv6_getsockopt,
+	.sendmsg =	udpv6_sendmsg,
+	.recvmsg =	udpv6_recvmsg,
+	.backlog_rcv =	udpv6_queue_rcv_skb,
+	.hash =		udp_v6_hash,
+	.unhash =	udp_v6_unhash,
+	.get_port =	udp_v6_get_port,
 };
 
 extern struct proto_ops inet6_dgram_ops;
 
 static struct inet_protosw udpv6_protosw = {
-	type:        SOCK_DGRAM,
-	protocol:    IPPROTO_UDP,
-	prot:        &udpv6_prot,
-	ops:         &inet6_dgram_ops,
-	capability:  -1,
-	no_check:    UDP_CSUM_DEFAULT,
-	flags:       INET_PROTOSW_PERMANENT,
+	.type =      SOCK_DGRAM,
+	.protocol =  IPPROTO_UDP,
+	.prot =      &udpv6_prot,
+	.ops =       &inet6_dgram_ops,
+	.capability =-1,
+	.no_check =  UDP_CSUM_DEFAULT,
+	.flags =     INET_PROTOSW_PERMANENT,
 };
 
 
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 7f0106d39935..425f09984e5e 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -2485,48 +2485,48 @@ int ipx_unregister_spx(void)
  */
 
 static struct net_proto_family ipx_family_ops = {
-	family:		PF_IPX,
-	create:		ipx_create,
+	.family =	PF_IPX,
+	.create =	ipx_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
-	family:		PF_IPX,
-
-	release:	ipx_release,
-	bind:		ipx_bind,
-	connect:	ipx_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	ipx_getname,
-	poll:		datagram_poll,
-	ioctl:		ipx_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown, /* FIXME: have to support shutdown */
-	setsockopt:	ipx_setsockopt,
-	getsockopt:	ipx_getsockopt,
-	sendmsg:	ipx_sendmsg,
-	recvmsg:	ipx_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IPX,
+
+	.release =	ipx_release,
+	.bind =		ipx_bind,
+	.connect =	ipx_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	ipx_getname,
+	.poll =		datagram_poll,
+	.ioctl =	ipx_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown, /* FIXME: have to support shutdown */
+	.setsockopt =	ipx_setsockopt,
+	.getsockopt =	ipx_getsockopt,
+	.sendmsg =	ipx_sendmsg,
+	.recvmsg =	ipx_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
 SOCKOPS_WRAP(ipx_dgram, PF_IPX);
 
 static struct packet_type ipx_8023_packet_type = {
-	type:		__constant_htons(ETH_P_802_3),
-	func:		ipx_rcv,
-	data:		(void *) 1,	/* yap, I understand shared skbs :-) */
+	.type =		__constant_htons(ETH_P_802_3),
+	.func =		ipx_rcv,
+	.data =		(void *) 1,	/* yap, I understand shared skbs :-) */
 };
 
 static struct packet_type ipx_dix_packet_type = {
-	type:		__constant_htons(ETH_P_IPX),
-	func:		ipx_rcv,
-	data:		(void *) 1,	/* yap, I understand shared skbs :-) */
+	.type =		__constant_htons(ETH_P_IPX),
+	.func =		ipx_rcv,
+	.data =		(void *) 1,	/* yap, I understand shared skbs :-) */
 };
 
 static struct notifier_block ipx_dev_notifier = {
-	notifier_call:	ipxitf_device_event,
+	.notifier_call =ipxitf_device_event,
 };
 
 
diff --git a/net/ipx/af_spx.c b/net/ipx/af_spx.c
index a844c082d796..761225f007f0 100644
--- a/net/ipx/af_spx.c
+++ b/net/ipx/af_spx.c
@@ -833,32 +833,32 @@ static int spx_getsockopt(struct socket *sock, int level, int optname,
 }
 
 static struct proto_ops SOCKOPS_WRAPPED(spx_ops) = {
-	family:		PF_IPX,
-
-	release:	spx_release,
-	bind:		spx_bind,
-	connect:	spx_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		spx_accept,
-	getname:	spx_getname,
-	poll:		spx_datagram_poll,
-	ioctl:		spx_ioctl,
-	listen:		spx_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	spx_setsockopt,
-	getsockopt:	spx_getsockopt,
-	sendmsg:	spx_sendmsg,
-	recvmsg:	spx_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IPX,
+
+	.release =	spx_release,
+	.bind =		spx_bind,
+	.connect =	spx_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	spx_accept,
+	.getname =	spx_getname,
+	.poll =		spx_datagram_poll,
+	.ioctl =	spx_ioctl,
+	.listen =	spx_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	spx_setsockopt,
+	.getsockopt =	spx_getsockopt,
+	.sendmsg =	spx_sendmsg,
+	.recvmsg =	spx_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
 SOCKOPS_WRAP(spx, PF_IPX);
 
 static struct net_proto_family spx_family_ops = {
-	family:	 PF_IPX,
-	create:	 spx_create,
+	.family = PF_IPX,
+	.create = spx_create,
 };
 
 static char banner[] __initdata =
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 87aaa492c545..c37c0118096f 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2414,93 +2414,93 @@ bed:
 }
 
 static struct net_proto_family irda_family_ops = {
-	family:	PF_IRDA,
-	create:	irda_create,
+	.family =PF_IRDA,
+	.create =irda_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = {
-	family:		PF_IRDA,
-
-	release:	irda_release,
-	bind:		irda_bind,
-	connect:	irda_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		irda_accept,
-	getname:	irda_getname,
-	poll:		irda_poll,
-	ioctl:		irda_ioctl,
-	listen:		irda_listen,
-	shutdown:	irda_shutdown,
-	setsockopt:	irda_setsockopt,
-	getsockopt:	irda_getsockopt,
-	sendmsg:	irda_sendmsg,
-	recvmsg:	irda_recvmsg_stream,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IRDA,
+
+	.release =	irda_release,
+	.bind =		irda_bind,
+	.connect =	irda_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	irda_accept,
+	.getname =	irda_getname,
+	.poll =		irda_poll,
+	.ioctl =	irda_ioctl,
+	.listen =	irda_listen,
+	.shutdown =	irda_shutdown,
+	.setsockopt =	irda_setsockopt,
+	.getsockopt =	irda_getsockopt,
+	.sendmsg =	irda_sendmsg,
+	.recvmsg =	irda_recvmsg_stream,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(irda_seqpacket_ops) = {
-	family:		PF_IRDA,
-
-	release:	irda_release,
-	bind:		irda_bind,
-	connect:	irda_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		irda_accept,
-	getname:	irda_getname,
-	poll:		datagram_poll,
-	ioctl:		irda_ioctl,
-	listen:		irda_listen,
-	shutdown:	irda_shutdown,
-	setsockopt:	irda_setsockopt,
-	getsockopt:	irda_getsockopt,
-	sendmsg:	irda_sendmsg,
-	recvmsg:	irda_recvmsg_dgram,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IRDA,
+
+	.release =	irda_release,
+	.bind =		irda_bind,
+	.connect =	irda_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	irda_accept,
+	.getname =	irda_getname,
+	.poll =		datagram_poll,
+	.ioctl =	irda_ioctl,
+	.listen =	irda_listen,
+	.shutdown =	irda_shutdown,
+	.setsockopt =	irda_setsockopt,
+	.getsockopt =	irda_getsockopt,
+	.sendmsg =	irda_sendmsg,
+	.recvmsg =	irda_recvmsg_dgram,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(irda_dgram_ops) = {
-	family:		PF_IRDA,
-
-	release:	irda_release,
-	bind:		irda_bind,
-	connect:	irda_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		irda_accept,
-	getname:	irda_getname,
-	poll:		datagram_poll,
-	ioctl:		irda_ioctl,
-	listen:		irda_listen,
-	shutdown:	irda_shutdown,
-	setsockopt:	irda_setsockopt,
-	getsockopt:	irda_getsockopt,
-	sendmsg:	irda_sendmsg_dgram,
-	recvmsg:	irda_recvmsg_dgram,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IRDA,
+
+	.release =	irda_release,
+	.bind =		irda_bind,
+	.connect =	irda_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	irda_accept,
+	.getname =	irda_getname,
+	.poll =		datagram_poll,
+	.ioctl =	irda_ioctl,
+	.listen =	irda_listen,
+	.shutdown =	irda_shutdown,
+	.setsockopt =	irda_setsockopt,
+	.getsockopt =	irda_getsockopt,
+	.sendmsg =	irda_sendmsg_dgram,
+	.recvmsg =	irda_recvmsg_dgram,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #ifdef CONFIG_IRDA_ULTRA
 static struct proto_ops SOCKOPS_WRAPPED(irda_ultra_ops) = {
-	family:		PF_IRDA,
-
-	release:	irda_release,
-	bind:		irda_bind,
-	connect:	sock_no_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	irda_getname,
-	poll:		datagram_poll,
-	ioctl:		irda_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	irda_shutdown,
-	setsockopt:	irda_setsockopt,
-	getsockopt:	irda_getsockopt,
-	sendmsg:	irda_sendmsg_ultra,
-	recvmsg:	irda_recvmsg_dgram,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_IRDA,
+
+	.release =	irda_release,
+	.bind =		irda_bind,
+	.connect =	sock_no_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	irda_getname,
+	.poll =		datagram_poll,
+	.ioctl =	irda_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	irda_shutdown,
+	.setsockopt =	irda_setsockopt,
+	.getsockopt =	irda_getsockopt,
+	.sendmsg =	irda_sendmsg_ultra,
+	.recvmsg =	irda_recvmsg_dgram,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 #endif /* CONFIG_IRDA_ULTRA */
 
diff --git a/net/llc/llc_c_st.c b/net/llc/llc_c_st.c
index ef52dc23ad13..fb938c640392 100644
--- a/net/llc/llc_c_st.c
+++ b/net/llc/llc_c_st.c
@@ -4896,51 +4896,51 @@ static struct llc_conn_state_trans *llc_temp_state_transitions[] = {
 /* Connection State Transition Table */
 struct llc_conn_state llc_conn_state_table[] = {
 	{
-		current_state:	LLC_CONN_STATE_ADM,
-		transitions:	llc_adm_state_transitions,
+		.current_state =LLC_CONN_STATE_ADM,
+		.transitions =	llc_adm_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_SETUP,
-		transitions:	llc_setup_state_transitions,
+		.current_state =LLC_CONN_STATE_SETUP,
+		.transitions =	llc_setup_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_NORMAL,
-		transitions:	llc_normal_state_transitions,
+		.current_state =LLC_CONN_STATE_NORMAL,
+		.transitions =	llc_normal_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_BUSY,
-		transitions:	llc_busy_state_transitions,
+		.current_state =LLC_CONN_STATE_BUSY,
+		.transitions =	llc_busy_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_REJ,
-		transitions:	llc_reject_state_transitions,
+		.current_state =LLC_CONN_STATE_REJ,
+		.transitions =	llc_reject_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_AWAIT,
-		transitions:	llc_await_state_transitions,
+		.current_state =LLC_CONN_STATE_AWAIT,
+		.transitions =	llc_await_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_AWAIT_BUSY,
-		transitions:	llc_await_busy_state_transitions,
+		.current_state =LLC_CONN_STATE_AWAIT_BUSY,
+		.transitions =	llc_await_busy_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_AWAIT_REJ,
-		transitions:	llc_await_rejct_state_transitions,
+		.current_state =LLC_CONN_STATE_AWAIT_REJ,
+		.transitions =	llc_await_rejct_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_D_CONN,
-		transitions:	llc_d_conn_state_transitions,
+		.current_state =LLC_CONN_STATE_D_CONN,
+		.transitions =	llc_d_conn_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_RESET,
-		transitions:	llc_rst_state_transitions,
+		.current_state =LLC_CONN_STATE_RESET,
+		.transitions =	llc_rst_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_ERROR,
-		transitions:	llc_error_state_transitions,
+		.current_state =LLC_CONN_STATE_ERROR,
+		.transitions =	llc_error_state_transitions,
 	},
 	{
-		current_state:	LLC_CONN_STATE_TEMP,
-		transitions:	llc_temp_state_transitions,
+		.current_state =LLC_CONN_STATE_TEMP,
+		.transitions =	llc_temp_state_transitions,
 	},
 };
diff --git a/net/llc/llc_s_st.c b/net/llc/llc_s_st.c
index 1c93ac638802..1dfcf1abb2f7 100644
--- a/net/llc/llc_s_st.c
+++ b/net/llc/llc_s_st.c
@@ -173,11 +173,11 @@ static struct llc_sap_state_trans *llc_sap_active_state_transitions[] = {
 /* SAP state transition table */
 struct llc_sap_state llc_sap_state_table[] = {
 	{
-		curr_state:	LLC_SAP_STATE_INACTIVE,
-		transitions:	llc_sap_inactive_state_transitions,
+		.curr_state =	LLC_SAP_STATE_INACTIVE,
+		.transitions =	llc_sap_inactive_state_transitions,
        	},
 	{
-		curr_state:	LLC_SAP_STATE_ACTIVE,
-		transitions:	llc_sap_active_state_transitions,
+		.curr_state =	LLC_SAP_STATE_ACTIVE,
+		.transitions =	llc_sap_active_state_transitions,
 	},
 };
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index e35e8e83a094..610d9356f728 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -987,29 +987,29 @@ int netlink_unregister_notifier(struct notifier_block *nb)
 }
                 
 struct proto_ops netlink_ops = {
-	family:		PF_NETLINK,
-
-	release:	netlink_release,
-	bind:		netlink_bind,
-	connect:	netlink_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	netlink_getname,
-	poll:		datagram_poll,
-	ioctl:		sock_no_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	netlink_sendmsg,
-	recvmsg:	netlink_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_NETLINK,
+
+	.release =	netlink_release,
+	.bind =		netlink_bind,
+	.connect =	netlink_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	netlink_getname,
+	.poll =		datagram_poll,
+	.ioctl =	sock_no_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	netlink_sendmsg,
+	.recvmsg =	netlink_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 struct net_proto_family netlink_family_ops = {
-	family:	PF_NETLINK,
-	create:	netlink_create,
+	.family =PF_NETLINK,
+	.create =netlink_create,
 };
 
 static int __init netlink_proto_init(void)
diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c
index 131209fea01d..e862a2068ee4 100644
--- a/net/netlink/netlink_dev.c
+++ b/net/netlink/netlink_dev.c
@@ -160,14 +160,14 @@ static int netlink_ioctl(struct inode *inode, struct file *file,
 
 
 static struct file_operations netlink_fops = {
-	owner:		THIS_MODULE,
-	llseek:		no_llseek,
-	read:		netlink_read,
-	write:		netlink_write,
-	poll:		netlink_poll,
-	ioctl:		netlink_ioctl,
-	open:		netlink_open,
-	release:	netlink_release,
+	.owner =	THIS_MODULE,
+	.llseek =	no_llseek,
+	.read =		netlink_read,
+	.write =	netlink_write,
+	.poll =		netlink_poll,
+	.ioctl =	netlink_ioctl,
+	.open =		netlink_open,
+	.release =	netlink_release,
 };
 
 static devfs_handle_t devfs_handle;
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 36cb8dc0374f..f1dddc7be67b 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1251,36 +1251,36 @@ static int nr_get_info(char *buffer, char **start, off_t offset, int length)
 } 
 
 static struct net_proto_family nr_family_ops = {
-	family:		PF_NETROM,
-	create:		nr_create,
+	.family =	PF_NETROM,
+	.create =	nr_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(nr_proto_ops) = {
-	family:		PF_NETROM,
-
-	release:	nr_release,
-	bind:		nr_bind,
-	connect:	nr_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		nr_accept,
-	getname:	nr_getname,
-	poll:		datagram_poll,
-	ioctl:		nr_ioctl,
-	listen:		nr_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	nr_setsockopt,
-	getsockopt:	nr_getsockopt,
-	sendmsg:	nr_sendmsg,
-	recvmsg:	nr_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_NETROM,
+
+	.release =	nr_release,
+	.bind =		nr_bind,
+	.connect =	nr_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	nr_accept,
+	.getname =	nr_getname,
+	.poll =		datagram_poll,
+	.ioctl =	nr_ioctl,
+	.listen =	nr_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	nr_setsockopt,
+	.getsockopt =	nr_getsockopt,
+	.sendmsg =	nr_sendmsg,
+	.recvmsg =	nr_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
 SOCKOPS_WRAP(nr_proto, PF_NETROM);
 
 static struct notifier_block nr_dev_notifier = {
-	notifier_call:	nr_device_event,
+	.notifier_call =nr_device_event,
 };
 
 static struct net_device *dev_nr;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 75000d694681..edad9e2f8b7a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1609,8 +1609,8 @@ static void packet_mm_close(struct vm_area_struct *vma)
 }
 
 static struct vm_operations_struct packet_mmap_ops = {
-	open:	packet_mm_open,
-	close:	packet_mm_close,
+	.open =	packet_mm_open,
+	.close =packet_mm_close,
 };
 
 static void free_pg_vec(unsigned long *pg_vec, unsigned order, unsigned len)
@@ -1796,55 +1796,55 @@ out:
 
 #ifdef CONFIG_SOCK_PACKET
 struct proto_ops packet_ops_spkt = {
-	family:		PF_PACKET,
-
-	release:	packet_release,
-	bind:		packet_bind_spkt,
-	connect:	sock_no_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	packet_getname_spkt,
-	poll:		datagram_poll,
-	ioctl:		packet_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	packet_sendmsg_spkt,
-	recvmsg:	packet_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_PACKET,
+
+	.release =	packet_release,
+	.bind =		packet_bind_spkt,
+	.connect =	sock_no_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	packet_getname_spkt,
+	.poll =		datagram_poll,
+	.ioctl =	packet_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	packet_sendmsg_spkt,
+	.recvmsg =	packet_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 #endif
 
 struct proto_ops packet_ops = {
-	family:		PF_PACKET,
-
-	release:	packet_release,
-	bind:		packet_bind,
-	connect:	sock_no_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		sock_no_accept,
-	getname:	packet_getname, 
-	poll:		packet_poll,
-	ioctl:		packet_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	packet_setsockopt,
-	getsockopt:	packet_getsockopt,
-	sendmsg:	packet_sendmsg,
-	recvmsg:	packet_recvmsg,
-	mmap:		packet_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_PACKET,
+
+	.release =	packet_release,
+	.bind =		packet_bind,
+	.connect =	sock_no_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	packet_getname, 
+	.poll =		packet_poll,
+	.ioctl =	packet_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	packet_setsockopt,
+	.getsockopt =	packet_getsockopt,
+	.sendmsg =	packet_sendmsg,
+	.recvmsg =	packet_recvmsg,
+	.mmap =		packet_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 static struct net_proto_family packet_family_ops = {
-	family:		PF_PACKET,
-	create:		packet_create,
+	.family =	PF_PACKET,
+	.create =	packet_create,
 };
 
 static struct notifier_block packet_netdev_notifier = {
-	notifier_call:	packet_notifier,
+	.notifier_call =packet_notifier,
 };
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index a0c6f8982bc2..f9ccd78a8c0f 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1430,36 +1430,36 @@ static int rose_get_info(char *buffer, char **start, off_t offset, int length)
 } 
 
 static struct net_proto_family rose_family_ops = {
-	family:		PF_ROSE,
-	create:		rose_create,
+	.family =	PF_ROSE,
+	.create =	rose_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(rose_proto_ops) = {
-	family:		PF_ROSE,
-
-	release:	rose_release,
-	bind:		rose_bind,
-	connect:	rose_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		rose_accept,
-	getname:	rose_getname,
-	poll:		datagram_poll,
-	ioctl:		rose_ioctl,
-	listen:		rose_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	rose_setsockopt,
-	getsockopt:	rose_getsockopt,
-	sendmsg:	rose_sendmsg,
-	recvmsg:	rose_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_ROSE,
+
+	.release =	rose_release,
+	.bind =		rose_bind,
+	.connect =	rose_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	rose_accept,
+	.getname =	rose_getname,
+	.poll =		datagram_poll,
+	.ioctl =	rose_ioctl,
+	.listen =	rose_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	rose_setsockopt,
+	.getsockopt =	rose_getsockopt,
+	.sendmsg =	rose_sendmsg,
+	.recvmsg =	rose_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
 SOCKOPS_WRAP(rose_proto, PF_ROSE);
 
 static struct notifier_block rose_dev_notifier = {
-	notifier_call:	rose_device_event,
+	.notifier_call =rose_device_event,
 };
 
 static struct net_device *dev_rose;
diff --git a/net/socket.c b/net/socket.c
index 798eeab2f47c..60db586e2a3c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -112,18 +112,18 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
  */
 
 static struct file_operations socket_file_ops = {
-	llseek:		no_llseek,
-	read:		sock_read,
-	write:		sock_write,
-	poll:		sock_poll,
-	ioctl:		sock_ioctl,
-	mmap:		sock_mmap,
-	open:		sock_no_open,	/* special open code to disallow open via /proc */
-	release:	sock_close,
-	fasync:		sock_fasync,
-	readv:		sock_readv,
-	writev:		sock_writev,
-	sendpage:	sock_sendpage
+	.llseek =	no_llseek,
+	.read =		sock_read,
+	.write =	sock_write,
+	.poll =		sock_poll,
+	.ioctl =	sock_ioctl,
+	.mmap =		sock_mmap,
+	.open =		sock_no_open,	/* special open code to disallow open via /proc */
+	.release =	sock_close,
+	.fasync =	sock_fasync,
+	.readv =	sock_readv,
+	.writev =	sock_writev,
+	.sendpage =	sock_sendpage
 };
 
 /*
@@ -312,9 +312,9 @@ static int init_inodecache(void)
 }
 
 static struct super_operations sockfs_ops = {
-	alloc_inode:	sock_alloc_inode,
-	destroy_inode:	sock_destroy_inode,
-	statfs:		simple_statfs,
+	.alloc_inode =	sock_alloc_inode,
+	.destroy_inode =sock_destroy_inode,
+	.statfs =	simple_statfs,
 };
 
 static struct super_block *sockfs_get_sb(struct file_system_type *fs_type,
@@ -326,16 +326,16 @@ static struct super_block *sockfs_get_sb(struct file_system_type *fs_type,
 static struct vfsmount *sock_mnt;
 
 static struct file_system_type sock_fs_type = {
-	name:		"sockfs",
-	get_sb:		sockfs_get_sb,
-	kill_sb:	kill_anon_super,
+	.name =		"sockfs",
+	.get_sb =	sockfs_get_sb,
+	.kill_sb =	kill_anon_super,
 };
 static int sockfs_delete_dentry(struct dentry *dentry)
 {
 	return 1;
 }
 static struct dentry_operations sockfs_dentry_operations = {
-	d_delete:	sockfs_delete_dentry,
+	.d_delete =	sockfs_delete_dentry,
 };
 
 /*
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index db9b83bb6384..02b1b02bdbd8 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1816,50 +1816,50 @@ done:
 #endif
 
 struct proto_ops unix_stream_ops = {
-	family:		PF_UNIX,
+	.family =	PF_UNIX,
 	
-	release:	unix_release,
-	bind:		unix_bind,
-	connect:	unix_stream_connect,
-	socketpair:	unix_socketpair,
-	accept:		unix_accept,
-	getname:	unix_getname,
-	poll:		unix_poll,
-	ioctl:		unix_ioctl,
-	listen:		unix_listen,
-	shutdown:	unix_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	unix_stream_sendmsg,
-	recvmsg:	unix_stream_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.release =	unix_release,
+	.bind =		unix_bind,
+	.connect =	unix_stream_connect,
+	.socketpair =	unix_socketpair,
+	.accept =	unix_accept,
+	.getname =	unix_getname,
+	.poll =		unix_poll,
+	.ioctl =	unix_ioctl,
+	.listen =	unix_listen,
+	.shutdown =	unix_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	unix_stream_sendmsg,
+	.recvmsg =	unix_stream_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 struct proto_ops unix_dgram_ops = {
-	family:		PF_UNIX,
-
-	release:	unix_release,
-	bind:		unix_bind,
-	connect:	unix_dgram_connect,
-	socketpair:	unix_socketpair,
-	accept:		sock_no_accept,
-	getname:	unix_getname,
-	poll:		datagram_poll,
-	ioctl:		unix_ioctl,
-	listen:		sock_no_listen,
-	shutdown:	unix_shutdown,
-	setsockopt:	sock_no_setsockopt,
-	getsockopt:	sock_no_getsockopt,
-	sendmsg:	unix_dgram_sendmsg,
-	recvmsg:	unix_dgram_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	PF_UNIX,
+
+	.release =	unix_release,
+	.bind =		unix_bind,
+	.connect =	unix_dgram_connect,
+	.socketpair =	unix_socketpair,
+	.accept =	sock_no_accept,
+	.getname =	unix_getname,
+	.poll =		datagram_poll,
+	.ioctl =	unix_ioctl,
+	.listen =	sock_no_listen,
+	.shutdown =	unix_shutdown,
+	.setsockopt =	sock_no_setsockopt,
+	.getsockopt =	sock_no_getsockopt,
+	.sendmsg =	unix_dgram_sendmsg,
+	.recvmsg =	unix_dgram_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 struct net_proto_family unix_family_ops = {
-	family:	 PF_UNIX,
-	create:	 unix_create,
+	.family = PF_UNIX,
+	.create = unix_create,
 };
 
 #ifdef CONFIG_SYSCTL
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 0a9f62073788..cf585a136e29 100644
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -2697,22 +2697,22 @@ static int wanpipe_connect(struct socket *sock, struct sockaddr *uaddr, int addr
 
 #ifdef LINUX_2_4
 struct proto_ops wanpipe_ops = {
-	family: 	PF_WANPIPE,
-
-	release: 	wanpipe_release,
-	bind: 		wanpipe_bind,
-	connect: 	wanpipe_connect,
-	socketpair: 	sock_no_socketpair,
-	accept: 	wanpipe_accept,
-	getname: 	wanpipe_getname, 
-	poll: 		wanpipe_poll,
-	ioctl: 		wanpipe_ioctl,
-	listen: 	wanpipe_listen, 
-	shutdown: 	sock_no_shutdown,
-	setsockopt: 	sock_no_setsockopt,
-	getsockopt: 	sock_no_getsockopt,
-	sendmsg: 	wanpipe_sendmsg,
-	recvmsg: 	wanpipe_recvmsg
+	.family = 	PF_WANPIPE,
+
+	.release = 	wanpipe_release,
+	.bind = 		wanpipe_bind,
+	.connect = 	wanpipe_connect,
+	.socketpair = 	sock_no_socketpair,
+	.accept = 	wanpipe_accept,
+	.getname = 	wanpipe_getname, 
+	.poll = 		wanpipe_poll,
+	.ioctl = 		wanpipe_ioctl,
+	.listen = 	wanpipe_listen, 
+	.shutdown = 	sock_no_shutdown,
+	.setsockopt = 	sock_no_setsockopt,
+	.getsockopt = 	sock_no_getsockopt,
+	.sendmsg = 	wanpipe_sendmsg,
+	.recvmsg = 	wanpipe_recvmsg
 };
 #else
 struct proto_ops wanpipe_ops = {
@@ -2739,12 +2739,12 @@ struct proto_ops wanpipe_ops = {
 
 
 static struct net_proto_family wanpipe_family_ops = {
-	family:	PF_WANPIPE,
-	create:	wanpipe_create,
+	.family =PF_WANPIPE,
+	.create =wanpipe_create,
 };
 
 struct notifier_block wanpipe_netdev_notifier = {
-	notifier_call:	wanpipe_notifier,
+	.notifier_call =wanpipe_notifier,
 };
 
 
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index f27ee2df571b..b3ba10e04e66 100644
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -81,7 +81,7 @@ static int router_proc_perms(struct inode *, int);
 
 static struct inode_operations router_inode =
 {
-	permission:	router_proc_perms,
+	.permission =	router_proc_perms,
 };
 
 /*
@@ -194,17 +194,17 @@ static int status_show(struct seq_file *m, void *v)
 }
 
 static struct seq_operations config_op = {
-	start:	r_start,
-	next:	r_next,
-	stop:	r_stop,
-	show:	config_show
+	.start =r_start,
+	.next =	r_next,
+	.stop =	r_stop,
+	.show =	config_show
 };
 
 static struct seq_operations status_op = {
-	start:	r_start,
-	next:	r_next,
-	stop:	r_stop,
-	show:	status_show
+	.start =r_start,
+	.next =	r_next,
+	.stop =	r_stop,
+	.show =	status_show
 };
 
 static int config_open(struct inode *inode, struct file *file)
@@ -219,18 +219,18 @@ static int status_open(struct inode *inode, struct file *file)
 
 static struct file_operations config_fops =
 {
-	open:		config_open,
-	read:		seq_read,
-	llseek:		seq_lseek,
-	release:	seq_release,
+	.open =		config_open,
+	.read =		seq_read,
+	.llseek =	seq_lseek,
+	.release =	seq_release,
 };
 
 static struct file_operations status_fops =
 {
-	open:		status_open,
-	read:		seq_read,
-	llseek:		seq_lseek,
-	release:	seq_release,
+	.open =		status_open,
+	.read =		seq_read,
+	.llseek =	seq_lseek,
+	.release =	seq_release,
 };
 
 static int wandev_show(struct seq_file *m, void *v)
@@ -302,11 +302,11 @@ static int wandev_open(struct inode *inode, struct file *file)
 
 static struct file_operations wandev_fops =
 {
-	open:		wandev_open,
-	read:		seq_read,
-	llseek:		seq_lseek,
-	release:	single_release,
-	ioctl:		wanrouter_ioctl,
+	.open =		wandev_open,
+	.read =		seq_read,
+	.llseek =	seq_lseek,
+	.release =	single_release,
+	.ioctl =	wanrouter_ioctl,
 };
 
 /*
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index aba8ec2954af..3a7f8165865c 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1278,29 +1278,29 @@ static int x25_get_info(char *buffer, char **start, off_t offset, int length)
 } 
 
 struct net_proto_family x25_family_ops = {
-	family:		AF_X25,
-	create:		x25_create,
+	.family =	AF_X25,
+	.create =	x25_create,
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(x25_proto_ops) = {
-	family:		AF_X25,
-
-	release:	x25_release,
-	bind:		x25_bind,
-	connect:	x25_connect,
-	socketpair:	sock_no_socketpair,
-	accept:		x25_accept,
-	getname:	x25_getname,
-	poll:		datagram_poll,
-	ioctl:		x25_ioctl,
-	listen:		x25_listen,
-	shutdown:	sock_no_shutdown,
-	setsockopt:	x25_setsockopt,
-	getsockopt:	x25_getsockopt,
-	sendmsg:	x25_sendmsg,
-	recvmsg:	x25_recvmsg,
-	mmap:		sock_no_mmap,
-	sendpage:	sock_no_sendpage,
+	.family =	AF_X25,
+
+	.release =	x25_release,
+	.bind =		x25_bind,
+	.connect =	x25_connect,
+	.socketpair =	sock_no_socketpair,
+	.accept =	x25_accept,
+	.getname =	x25_getname,
+	.poll =		datagram_poll,
+	.ioctl =	x25_ioctl,
+	.listen =	x25_listen,
+	.shutdown =	sock_no_shutdown,
+	.setsockopt =	x25_setsockopt,
+	.getsockopt =	x25_getsockopt,
+	.sendmsg =	x25_sendmsg,
+	.recvmsg =	x25_recvmsg,
+	.mmap =		sock_no_mmap,
+	.sendpage =	sock_no_sendpage,
 };
 
 #include <linux/smp_lock.h>
@@ -1308,12 +1308,12 @@ SOCKOPS_WRAP(x25_proto, AF_X25);
 
 
 static struct packet_type x25_packet_type = {
-	type:		__constant_htons(ETH_P_X25),
-	func:		x25_lapb_receive_frame,
+	.type =		__constant_htons(ETH_P_X25),
+	.func =		x25_lapb_receive_frame,
 };
 
 struct notifier_block x25_dev_notifier = {
-	notifier_call:	x25_device_event,
+	.notifier_call =x25_device_event,
 };
 
 void x25_kill_by_neigh(struct x25_neigh *neigh)