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

net/appletalk/ddp.c: More merge botches by yours truly.

parent e6e63a3b
...@@ -1916,6 +1916,10 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1916,6 +1916,10 @@ 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,
};
static struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
.family = PF_APPLETALK,
.release = atalk_release, .release = atalk_release,
.bind = atalk_bind, .bind = atalk_bind,
.connect = atalk_connect, .connect = atalk_connect,
......
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