Commit e6e63a3b authored by David S. Miller's avatar David S. Miller

net/appletalk/ddp.c: Fix merge botch by yours truly.

parent f4bec17b
...@@ -1914,27 +1914,24 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1914,27 +1914,24 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
} }
static struct net_proto_family atalk_family_ops = { static struct net_proto_family atalk_family_ops = {
.family =PF_APPLETALK, .family = PF_APPLETALK,
.create =atalk_create, .create = atalk_create,
}; .release = atalk_release,
.bind = atalk_bind,
.family = PF_APPLETALK, .connect = atalk_connect,
.release = atalk_release, .socketpair = sock_no_socketpair,
.bind = atalk_bind, .accept = sock_no_accept,
.connect = atalk_connect, .getname = atalk_getname,
.socketpair = sock_no_socketpair, .poll = datagram_poll,
.accept = sock_no_accept, .ioctl = atalk_ioctl,
.getname = atalk_getname, .listen = sock_no_listen,
.poll = datagram_poll, .shutdown = sock_no_shutdown,
.ioctl = atalk_ioctl, .setsockopt = sock_no_setsockopt,
.listen = sock_no_listen, .getsockopt = sock_no_getsockopt,
.shutdown = sock_no_shutdown, .sendmsg = atalk_sendmsg,
.setsockopt = sock_no_setsockopt, .recvmsg = atalk_recvmsg,
.getsockopt = sock_no_getsockopt, .mmap = sock_no_mmap,
.sendmsg = atalk_sendmsg, .sendpage = sock_no_sendpage,
.recvmsg = atalk_recvmsg,
.mmap = sock_no_mmap,
.sendpage = sock_no_sendpage,
}; };
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
......
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