Skip to content

L
linux
Commit 51fe3031 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o net: CodyngStyle reformatting, no code changes

parent f9d752e7
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 147 deletions
drivers/net/pppox.c
View file @ 51fe3031
...@@ -127,17 +127,13 @@ static int pppox_create(struct socket *sock, int protocol) ...@@ -127,17 +127,13 @@ static int pppox_create(struct socket *sock, int protocol)
} }
static struct net_proto_family pppox_proto_family = { static struct net_proto_family pppox_proto_family = {
PF_PPPOX, .family = PF_PPPOX,
pppox_create .create = pppox_create,
}; };
static int __init pppox_init(void) static int __init pppox_init(void)
{ {
int err = 0; return sock_register(&pppox_proto_family);
err = sock_register(&pppox_proto_family);
return err;
} }
static void __exit pppox_exit(void) static void __exit pppox_exit(void)
......
net/bluetooth/af_bluetooth.c
View file @ 51fe3031
...@@ -320,9 +320,9 @@ int bt_sock_w4_connect(struct sock *sk, int flags) ...@@ -320,9 +320,9 @@ int bt_sock_w4_connect(struct sock *sk, int flags)
return err; return err;
} }
struct net_proto_family bt_sock_family_ops = struct net_proto_family bt_sock_family_ops = {
{ .family = PF_BLUETOOTH,
PF_BLUETOOTH, bt_sock_create .create = bt_sock_create,
}; };
extern int hci_sock_init(void); extern int hci_sock_init(void);
......
net/bluetooth/hci_sock.c
View file @ 51fe3031
...@@ -633,7 +633,7 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event, ...@@ -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 = { struct net_proto_family hci_sock_family_ops = {
.family = PF_BLUETOOTH, .family = PF_BLUETOOTH,
.create = hci_sock_create .create = hci_sock_create,
}; };
struct notifier_block hci_sock_nblock = { struct notifier_block hci_sock_nblock = {
......
net/bluetooth/l2cap.c
View file @ 51fe3031
...@@ -2103,7 +2103,7 @@ static struct proto_ops l2cap_sock_ops = { ...@@ -2103,7 +2103,7 @@ static struct proto_ops l2cap_sock_ops = {
static struct net_proto_family l2cap_sock_family_ops = { static struct net_proto_family l2cap_sock_family_ops = {
.family = PF_BLUETOOTH, .family = PF_BLUETOOTH,
.create = l2cap_sock_create .create = l2cap_sock_create,
}; };
static struct hci_proto l2cap_hci_proto = { static struct hci_proto l2cap_hci_proto = {
......
net/bluetooth/sco.c
View file @ 51fe3031
...@@ -988,7 +988,7 @@ static struct proto_ops sco_sock_ops = { ...@@ -988,7 +988,7 @@ static struct proto_ops sco_sock_ops = {
static struct net_proto_family sco_sock_family_ops = { static struct net_proto_family sco_sock_family_ops = {
.family = PF_BLUETOOTH, .family = PF_BLUETOOTH,
.create = sco_sock_create .create = sco_sock_create,
}; };
static struct hci_proto sco_hci_proto = { static struct hci_proto sco_hci_proto = {
......
net/ipv4/devinet.c
View file @ 51fe3031
...@@ -1131,166 +1131,166 @@ static struct devinet_sysctl_table { ...@@ -1131,166 +1131,166 @@ static struct devinet_sysctl_table {
} devinet_sysctl = { } devinet_sysctl = {
.devinet_vars = { .devinet_vars = {
{ {
.ctl_name = NET_IPV4_CONF_FORWARDING, .ctl_name = NET_IPV4_CONF_FORWARDING,
.procname = "forwarding", .procname = "forwarding",
.data = &ipv4_devconf.forwarding, .data = &ipv4_devconf.forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&devinet_sysctl_forward, .proc_handler = &devinet_sysctl_forward,
}, },
{ {
.ctl_name = NET_IPV4_CONF_MC_FORWARDING, .ctl_name = NET_IPV4_CONF_MC_FORWARDING,
.procname = "mc_forwarding", .procname = "mc_forwarding",
.data = &ipv4_devconf.mc_forwarding, .data = &ipv4_devconf.mc_forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_ACCEPT_REDIRECTS, .ctl_name = NET_IPV4_CONF_ACCEPT_REDIRECTS,
.procname = "accept_redirects", .procname = "accept_redirects",
.data = &ipv4_devconf.accept_redirects, .data = &ipv4_devconf.accept_redirects,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_SECURE_REDIRECTS, .ctl_name = NET_IPV4_CONF_SECURE_REDIRECTS,
.procname = "secure_redirects", .procname = "secure_redirects",
.data = &ipv4_devconf.secure_redirects, .data = &ipv4_devconf.secure_redirects,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_SHARED_MEDIA, .ctl_name = NET_IPV4_CONF_SHARED_MEDIA,
.procname = "shared_media", .procname = "shared_media",
.data = &ipv4_devconf.shared_media, .data = &ipv4_devconf.shared_media,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_RP_FILTER, .ctl_name = NET_IPV4_CONF_RP_FILTER,
.procname = "rp_filter", .procname = "rp_filter",
.data = &ipv4_devconf.rp_filter, .data = &ipv4_devconf.rp_filter,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_SEND_REDIRECTS, .ctl_name = NET_IPV4_CONF_SEND_REDIRECTS,
.procname = "send_redirects", .procname = "send_redirects",
.data = &ipv4_devconf.send_redirects, .data = &ipv4_devconf.send_redirects,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE, .ctl_name = NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,
.procname = "accept_source_route", .procname = "accept_source_route",
.data = &ipv4_devconf.accept_source_route, .data = &ipv4_devconf.accept_source_route,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_PROXY_ARP, .ctl_name = NET_IPV4_CONF_PROXY_ARP,
.procname = "proxy_arp", .procname = "proxy_arp",
.data = &ipv4_devconf.proxy_arp, .data = &ipv4_devconf.proxy_arp,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_MEDIUM_ID, .ctl_name = NET_IPV4_CONF_MEDIUM_ID,
.procname = "medium_id", .procname = "medium_id",
.data = &ipv4_devconf.medium_id, .data = &ipv4_devconf.medium_id,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_BOOTP_RELAY, .ctl_name = NET_IPV4_CONF_BOOTP_RELAY,
.procname = "bootp_relay", .procname = "bootp_relay",
.data = &ipv4_devconf.bootp_relay, .data = &ipv4_devconf.bootp_relay,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_LOG_MARTIANS, .ctl_name = NET_IPV4_CONF_LOG_MARTIANS,
.procname = "log_martians", .procname = "log_martians",
.data = &ipv4_devconf.log_martians, .data = &ipv4_devconf.log_martians,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_TAG, .ctl_name = NET_IPV4_CONF_TAG,
.procname = "tag", .procname = "tag",
.data = &ipv4_devconf.tag, .data = &ipv4_devconf.tag,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_ARPFILTER, .ctl_name = NET_IPV4_CONF_ARPFILTER,
.procname = "arp_filter", .procname = "arp_filter",
.data = &ipv4_devconf.arp_filter, .data = &ipv4_devconf.arp_filter,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler =&proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = NET_IPV4_CONF_NOXFRM, .ctl_name = NET_IPV4_CONF_NOXFRM,
.procname = "disable_xfrm", .procname = "disable_xfrm",
.data = &ipv4_devconf.no_xfrm, .data = &ipv4_devconf.no_xfrm,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &ipv4_doint_and_flush, .proc_handler = &ipv4_doint_and_flush,
.strategy = &ipv4_doint_and_flush_strategy, .strategy = &ipv4_doint_and_flush_strategy,
}, },
{ {
.ctl_name = NET_IPV4_CONF_NOPOLICY, .ctl_name = NET_IPV4_CONF_NOPOLICY,
.procname = "disable_policy", .procname = "disable_policy",
.data = &ipv4_devconf.no_policy, .data = &ipv4_devconf.no_policy,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &ipv4_doint_and_flush, .proc_handler = &ipv4_doint_and_flush,
.strategy = &ipv4_doint_and_flush_strategy, .strategy = &ipv4_doint_and_flush_strategy,
}, },
}, },
.devinet_dev = { .devinet_dev = {
{ {
.ctl_name = NET_PROTO_CONF_ALL, .ctl_name = NET_PROTO_CONF_ALL,
.procname = "all", .procname = "all",
.mode = 0555, .mode = 0555,
.child = devinet_sysctl.devinet_vars, .child = devinet_sysctl.devinet_vars,
}, },
}, },
.devinet_conf_dir = { .devinet_conf_dir = {
{ {
.ctl_name = NET_IPV4_CONF, .ctl_name = NET_IPV4_CONF,
.procname = "conf", .procname = "conf",
.mode = 0555, .mode = 0555,
.child = devinet_sysctl.devinet_dev, .child = devinet_sysctl.devinet_dev,
}, },
}, },
.devinet_proto_dir = { .devinet_proto_dir = {
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
.procname = "ipv4", .procname = "ipv4",
.mode = 0555, .mode = 0555,
.child = devinet_sysctl.devinet_conf_dir, .child = devinet_sysctl.devinet_conf_dir,
}, },
}, },
.devinet_root_dir = { .devinet_root_dir = {
{ {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
.mode = 0555, .mode = 0555,
.child = devinet_sysctl.devinet_proto_dir, .child = devinet_sysctl.devinet_proto_dir,
}, },
}, },
}; };
......
net/ipv6/af_inet6.c
View file @ 51fe3031
...@@ -535,8 +535,8 @@ struct proto_ops inet6_dgram_ops = { ...@@ -535,8 +535,8 @@ struct proto_ops inet6_dgram_ops = {
}; };
struct net_proto_family inet6_family_ops = { struct net_proto_family inet6_family_ops = {
.family =PF_INET6, .family = PF_INET6,
.create =inet6_create, .create = inet6_create,
}; };
#ifdef MODULE #ifdef MODULE
...@@ -556,13 +556,13 @@ extern void ipv6_sysctl_unregister(void); ...@@ -556,13 +556,13 @@ extern void ipv6_sysctl_unregister(void);
#endif #endif
static struct inet_protosw rawv6_protosw = { static struct inet_protosw rawv6_protosw = {
.type = SOCK_RAW, .type = SOCK_RAW,
.protocol = IPPROTO_IP, /* wild card */ .protocol = IPPROTO_IP, /* wild card */
.prot = &rawv6_prot, .prot = &rawv6_prot,
.ops = &inet6_dgram_ops, .ops = &inet6_dgram_ops,
.capability =CAP_NET_RAW, .capability = CAP_NET_RAW,
.no_check = UDP_CSUM_DEFAULT, .no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}; };
#define INETSW6_ARRAY_LEN (sizeof(inetsw6_array) / sizeof(struct inet_protosw)) #define INETSW6_ARRAY_LEN (sizeof(inetsw6_array) / sizeof(struct inet_protosw))
......
net/irda/af_irda.c
View file @ 51fe3031
...@@ -2407,8 +2407,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2407,8 +2407,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
} }
static struct net_proto_family irda_family_ops = { static struct net_proto_family irda_family_ops = {
.family =PF_IRDA, .family = PF_IRDA,
.create =irda_create, .create = irda_create,
}; };
static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = { static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = {
......
net/netlink/af_netlink.c
View file @ 51fe3031
...@@ -1050,8 +1050,8 @@ struct proto_ops netlink_ops = { ...@@ -1050,8 +1050,8 @@ struct proto_ops netlink_ops = {
}; };
struct net_proto_family netlink_family_ops = { struct net_proto_family netlink_family_ops = {
.family =PF_NETLINK, .family = PF_NETLINK,
.create =netlink_create, .create = netlink_create,
}; };
static int __init netlink_proto_init(void) static int __init netlink_proto_init(void)
......
net/rose/af_rose.c
View file @ 51fe3031
...@@ -1434,7 +1434,7 @@ static struct proto_ops rose_proto_ops = { ...@@ -1434,7 +1434,7 @@ static struct proto_ops rose_proto_ops = {
.family = PF_ROSE, .family = PF_ROSE,
.release = rose_release, .release = rose_release,
.bind = rose_bind, .bind = rose_bind,
.connect = rose_connect, .connect = rose_connect,
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = rose_accept, .accept = rose_accept,
......
net/wanrouter/af_wanpipe.c
View file @ 51fe3031
...@@ -2561,13 +2561,13 @@ struct proto_ops wanpipe_ops = { ...@@ -2561,13 +2561,13 @@ struct proto_ops wanpipe_ops = {
.family = PF_WANPIPE, .family = PF_WANPIPE,
.release = wanpipe_release, .release = wanpipe_release,
.bind = wanpipe_bind, .bind = wanpipe_bind,
.connect = wanpipe_connect, .connect = wanpipe_connect,
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = wanpipe_accept, .accept = wanpipe_accept,
.getname = wanpipe_getname, .getname = wanpipe_getname,
.poll = wanpipe_poll, .poll = wanpipe_poll,
.ioctl = wanpipe_ioctl, .ioctl = wanpipe_ioctl,
.listen = wanpipe_listen, .listen = wanpipe_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,
...@@ -2577,12 +2577,12 @@ struct proto_ops wanpipe_ops = { ...@@ -2577,12 +2577,12 @@ struct proto_ops wanpipe_ops = {
}; };
static struct net_proto_family wanpipe_family_ops = { static struct net_proto_family wanpipe_family_ops = {
.family =PF_WANPIPE, .family = PF_WANPIPE,
.create =wanpipe_create, .create = wanpipe_create,
}; };
struct notifier_block wanpipe_netdev_notifier = { struct notifier_block wanpipe_netdev_notifier = {
.notifier_call =wanpipe_notifier, .notifier_call = wanpipe_notifier,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7