diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 | ||||
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c1fa693511a1..8523c76ebf76 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -774,7 +774,8 @@ out_err_release: | |||
| 774 | *dst = NULL; | 774 | *dst = NULL; |
| 775 | return err; | 775 | return err; |
| 776 | } | 776 | } |
| 777 | inline int ip6_ufo_append_data(struct sock *sk, | 777 | |
| 778 | static inline int ip6_ufo_append_data(struct sock *sk, | ||
| 778 | int getfrag(void *from, char *to, int offset, int len, | 779 | int getfrag(void *from, char *to, int offset, int len, |
| 779 | int odd, struct sk_buff *skb), | 780 | int odd, struct sk_buff *skb), |
| 780 | void *from, int length, int hh_len, int fragheaderlen, | 781 | void *from, int length, int hh_len, int fragheaderlen, |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 25757ade989f..3620718defe6 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -628,8 +628,8 @@ e_inval: | |||
| 628 | return -EINVAL; | 628 | return -EINVAL; |
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr, | 631 | static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr, |
| 632 | char __user *optval, int len) | 632 | char __user *optval, int len) |
| 633 | { | 633 | { |
| 634 | if (!hdr) | 634 | if (!hdr) |
| 635 | return 0; | 635 | return 0; |
