diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
| commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
| tree | fbb0757df837f3c75a99c518a3596c38daef162d /include/net/ipv6.h | |
| parent | 9996508b3353063f2d6c48c1a28a84543d72d70b (diff) | |
| parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index ad9a51130254..8c31d8a0c1fe 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -550,7 +550,7 @@ extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type); | |||
| 550 | extern int ipv6_setsockopt(struct sock *sk, int level, | 550 | extern int ipv6_setsockopt(struct sock *sk, int level, |
| 551 | int optname, | 551 | int optname, |
| 552 | char __user *optval, | 552 | char __user *optval, |
| 553 | int optlen); | 553 | unsigned int optlen); |
| 554 | extern int ipv6_getsockopt(struct sock *sk, int level, | 554 | extern int ipv6_getsockopt(struct sock *sk, int level, |
| 555 | int optname, | 555 | int optname, |
| 556 | char __user *optval, | 556 | char __user *optval, |
| @@ -559,7 +559,7 @@ extern int compat_ipv6_setsockopt(struct sock *sk, | |||
| 559 | int level, | 559 | int level, |
| 560 | int optname, | 560 | int optname, |
| 561 | char __user *optval, | 561 | char __user *optval, |
| 562 | int optlen); | 562 | unsigned int optlen); |
| 563 | extern int compat_ipv6_getsockopt(struct sock *sk, | 563 | extern int compat_ipv6_getsockopt(struct sock *sk, |
| 564 | int level, | 564 | int level, |
| 565 | int optname, | 565 | int optname, |