diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/net/transp_v6.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/net/transp_v6.h')
| -rw-r--r-- | include/net/transp_v6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index 8b075ab7a26c..4e86f2de6638 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h | |||
| @@ -37,7 +37,7 @@ extern int datagram_recv_ctl(struct sock *sk, | |||
| 37 | extern int datagram_send_ctl(struct msghdr *msg, | 37 | extern int datagram_send_ctl(struct msghdr *msg, |
| 38 | struct flowi *fl, | 38 | struct flowi *fl, |
| 39 | struct ipv6_txoptions *opt, | 39 | struct ipv6_txoptions *opt, |
| 40 | int *hlimit); | 40 | int *hlimit, int *tclass); |
| 41 | 41 | ||
| 42 | #define LOOPBACK4_IPV6 __constant_htonl(0x7f000006) | 42 | #define LOOPBACK4_IPV6 __constant_htonl(0x7f000006) |
| 43 | 43 | ||