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

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

drivers/net/pppox.c

@@ -127,17 +127,13 @@ static int pppox_create(struct socket *sock, int protocol)
 }
 
 static struct net_proto_family pppox_proto_family = {
-	PF_PPPOX,
-	pppox_create
+	.family	= PF_PPPOX,
+	.create	= pppox_create,
 };
 
 static int __init pppox_init(void)
 {
-	int err = 0;
-
-	err = sock_register(&pppox_proto_family);
-
-	return err;
+	return sock_register(&pppox_proto_family);
 }
 
 static void __exit pppox_exit(void)

net/bluetooth/af_bluetooth.c

@@ -320,9 +320,9 @@ int bt_sock_w4_connect(struct sock *sk, int flags)
 	return err;
 }
 
-struct net_proto_family bt_sock_family_ops =
-{
-	PF_BLUETOOTH, bt_sock_create
+struct net_proto_family bt_sock_family_ops = {
+	.family	= PF_BLUETOOTH,
+	.create	= bt_sock_create,
 };
 
 extern int hci_sock_init(void);

net/bluetooth/hci_sock.c

@@ -633,7 +633,7 @@ 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
+	.create = hci_sock_create,
 };
 
 struct notifier_block hci_sock_nblock = {

net/bluetooth/l2cap.c

@@ -2103,7 +2103,7 @@ static struct proto_ops l2cap_sock_ops = {
 
 static struct net_proto_family l2cap_sock_family_ops = {
 	.family =       PF_BLUETOOTH,
-	.create	=       l2cap_sock_create
+	.create	=       l2cap_sock_create,
 };
 
 static struct hci_proto l2cap_hci_proto = {

net/bluetooth/sco.c

@@ -988,7 +988,7 @@ static struct proto_ops sco_sock_ops = {
 
 static struct net_proto_family sco_sock_family_ops = {
 	.family =       PF_BLUETOOTH,
-	.create =       sco_sock_create
+	.create =       sco_sock_create,
 };
 
 static struct hci_proto sco_hci_proto = {

net/ipv4/devinet.c

@@ -1136,7 +1136,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.forwarding,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&devinet_sysctl_forward,
+			.proc_handler	= &devinet_sysctl_forward,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_MC_FORWARDING,
@@ -1144,7 +1144,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.mc_forwarding,
 			.maxlen		= sizeof(int),
 			.mode		= 0444,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_ACCEPT_REDIRECTS,
@@ -1152,7 +1152,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.accept_redirects,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_SECURE_REDIRECTS,
@@ -1160,7 +1160,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.secure_redirects,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_SHARED_MEDIA,
@@ -1168,7 +1168,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.shared_media,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_RP_FILTER,
@@ -1176,7 +1176,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.rp_filter,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_SEND_REDIRECTS,
@@ -1184,7 +1184,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.send_redirects,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,
@@ -1192,7 +1192,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.accept_source_route,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_PROXY_ARP,
@@ -1200,7 +1200,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.proxy_arp,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_MEDIUM_ID,
@@ -1208,7 +1208,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.medium_id,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_BOOTP_RELAY,
@@ -1216,7 +1216,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.bootp_relay,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_LOG_MARTIANS,
@@ -1224,7 +1224,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.log_martians,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_TAG,
@@ -1232,7 +1232,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.tag,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_ARPFILTER,
@@ -1240,7 +1240,7 @@ static struct devinet_sysctl_table {
 			.data		= &ipv4_devconf.arp_filter,
 			.maxlen		= sizeof(int),
 			.mode		= 0644,
-			.proc_handler =&proc_dointvec,
+			.proc_handler	= &proc_dointvec,
 		},
 		{
 			.ctl_name	= NET_IPV4_CONF_NOXFRM,

net/ipv6/af_inet6.c

@@ -536,8 +536,8 @@ struct proto_ops inet6_dgram_ops = {
 };
 
 struct net_proto_family inet6_family_ops = {
-	.family =PF_INET6,
-	.create =inet6_create,
+	.family = PF_INET6,
+	.create = inet6_create,
 };
 
 #ifdef MODULE
@@ -561,7 +561,7 @@ static struct inet_protosw rawv6_protosw = {
 	.protocol	= IPPROTO_IP,	/* wild card */
 	.prot		= &rawv6_prot,
 	.ops		= &inet6_dgram_ops,
-	.capability =CAP_NET_RAW,
+	.capability	= CAP_NET_RAW,
 	.no_check	= UDP_CSUM_DEFAULT,
 	.flags		= INET_PROTOSW_REUSE,
 };

net/irda/af_irda.c

@@ -2407,8 +2407,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 }
 
 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) = {

net/netlink/af_netlink.c

@@ -1050,8 +1050,8 @@ struct proto_ops netlink_ops = {
 };
 
 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)

net/wanrouter/af_wanpipe.c

@@ -2577,12 +2577,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,
 };