Commit 669b5216 authored by Ralf Bächle's avatar Ralf Bächle

Use ISO style labeled initializers.

parent 4b04ea0b
......@@ -1982,29 +1982,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 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>
......@@ -2014,12 +2014,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);
......
......@@ -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;
......
......@@ -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;
......
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