diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /net/ipv6/udp.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fed8e3aa2..5665c3225 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -7,7 +7,7 @@ * * Based on linux/ipv4/udp.c * - * $Id: udp.c,v 1.51 2000/02/27 19:51:51 davem Exp $ + * $Id: udp.c,v 1.52 2000/04/25 04:13:34 davem Exp $ * * Fixes: * Hideaki YOSHIFUJI : sin6_scope_id support @@ -972,24 +972,20 @@ out: } struct proto udpv6_prot = { - udpv6_close, /* close */ - udpv6_connect, /* connect */ - udp_disconnect, /* disconnect */ - NULL, /* accept */ - udp_ioctl, /* ioctl */ - NULL, /* init */ - inet6_destroy_sock, /* destroy */ - NULL, /* shutdown */ - ipv6_setsockopt, /* setsockopt */ - ipv6_getsockopt, /* getsockopt */ - udpv6_sendmsg, /* sendmsg */ - udpv6_recvmsg, /* recvmsg */ - NULL, /* bind */ - udpv6_queue_rcv_skb, /* backlog_rcv */ - udp_v6_hash, /* hash */ - udp_v6_unhash, /* unhash */ - udp_v6_get_port, /* get_port */ - "UDP", /* name */ + name: "UDP", + close: udpv6_close, + connect: udpv6_connect, + disconnect: udp_disconnect, + ioctl: udp_ioctl, + destroy: inet6_destroy_sock, + setsockopt: ipv6_setsockopt, + getsockopt: ipv6_getsockopt, + sendmsg: udpv6_sendmsg, + recvmsg: udpv6_recvmsg, + backlog_rcv: udpv6_queue_rcv_skb, + hash: udp_v6_hash, + unhash: udp_v6_unhash, + get_port: udp_v6_get_port, }; void __init udpv6_init(void) |