o net: CodyngStyle reformatting, no code changes

diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index 311c09f18bf0ceb70f56629c4ee026b87354eed7..9924827cdd2cf11002d0d6b54615da8cff1aabb8 100644 (file)
--- a/drivers/net/pppox.c
+++ b/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)

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 675fea39c9ab294959c1a54d58f1bcb5215400fb..bc2aa9b7453c7ee3345862b3a22bbd93558debe8 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/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);

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index dc04d28682475b6a36fee394b6ef0af53f455110..7f88db9e62bae32528398a5f4640aef10d845664 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/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 = {

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index e91c20ad1b169595e3a013ae284421d736ab35ef..3b29b9aca99d11910b323f10a92de22f7a7003a2 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/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 = {

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 96a36771137206f21bc1cffb7bde19d8939f31e6..de427d58993e92f39ef26cab7d7bdbc18506f1e5 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/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 = {

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index a3f0f800b01117b56c91e7c91779e8da6a6014ba..33b63c9404e8228387dfcc96a5205ea43e13cf23 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1131,166 +1131,166 @@ static struct devinet_sysctl_table {
 } devinet_sysctl = {
        .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,
                },
                {
-                       .ctl_name =     NET_IPV4_CONF_NOXFRM,
-                       .procname =     "disable_xfrm",
-                       .data = &ipv4_devconf.no_xfrm,
-                       .maxlen =               sizeof(int),
-                       .mode = 0644,
-                       .proc_handler = &ipv4_doint_and_flush,
-                       .strategy = &ipv4_doint_and_flush_strategy,
+                       .ctl_name       = NET_IPV4_CONF_NOXFRM,
+                       .procname       = "disable_xfrm",
+                       .data           = &ipv4_devconf.no_xfrm,
+                       .maxlen         = sizeof(int),
+                       .mode           = 0644,
+                       .proc_handler   = &ipv4_doint_and_flush,
+                       .strategy       = &ipv4_doint_and_flush_strategy,
                },
                {
-                       .ctl_name =     NET_IPV4_CONF_NOPOLICY,
-                       .procname =     "disable_policy",
-                       .data = &ipv4_devconf.no_policy,
-                       .maxlen =               sizeof(int),
-                       .mode = 0644,
-                       .proc_handler = &ipv4_doint_and_flush,
-                       .strategy = &ipv4_doint_and_flush_strategy,
+                       .ctl_name       = NET_IPV4_CONF_NOPOLICY,
+                       .procname       = "disable_policy",
+                       .data           = &ipv4_devconf.no_policy,
+                       .maxlen         = sizeof(int),
+                       .mode           = 0644,
+                       .proc_handler   = &ipv4_doint_and_flush,
+                       .strategy       = &ipv4_doint_and_flush_strategy,
                },
        },
        .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 = {
                {
-                       .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 = {
                {
-                       .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 = {
                {
-                       .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/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 8e2b3a009d6fbd22ec838f4bfe6e4f6c51c4db6b..d42424c8750f1b231269dc8f1f697aec5521fa12 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -535,8 +535,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
@@ -556,13 +556,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/irda/af_irda.c b/net/irda/af_irda.c
index 93962b0ce725ea63ab214fc024677e5bd7b21ea3..0df09dc8bf98e15a5f89a5c9d93730e186809766 100644 (file)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2407,8 +2407,8 @@ 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) = {

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 1994bc022231467633f1dafa45ed36866914d04d..d77a9689004b6cbe261bfb23387fd521e1a3ea0f 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/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)

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 6f0b9f521cfacc85db16f2c9b9b07fb42a30b459..131a0bf7eb317b32fd7535ededc2c5c492ccfdef 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1434,7 +1434,7 @@ static struct proto_ops rose_proto_ops = {
        .family         =       PF_ROSE,
 
        .release        =       rose_release,
-       .bind           =               rose_bind,
+       .bind           =       rose_bind,
        .connect        =       rose_connect,
        .socketpair     =       sock_no_socketpair,
        .accept         =       rose_accept,

diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 5cf84a16c519ce0560b0ad70a612448a94ab7066..dfc0fba877626760a449592cd3b9cf26d11851d6 100644 (file)
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -2561,13 +2561,13 @@ struct proto_ops wanpipe_ops = {
        .family =       PF_WANPIPE,
 
        .release =      wanpipe_release,
-       .bind =                 wanpipe_bind,
+       .bind =         wanpipe_bind,
        .connect =      wanpipe_connect,
        .socketpair =   sock_no_socketpair,
        .accept =       wanpipe_accept,
        .getname =      wanpipe_getname, 
-       .poll =                 wanpipe_poll,
-       .ioctl =                wanpipe_ioctl,
+       .poll =         wanpipe_poll,
+       .ioctl =        wanpipe_ioctl,
        .listen =       wanpipe_listen, 
        .shutdown =     sock_no_shutdown,
        .setsockopt =   sock_no_setsockopt,
@@ -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,
 };