diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/net/transp_v6.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
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 | ||