diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-03-10 20:06:24 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2014-03-10 20:06:24 +0530 |
| commit | 979bc71efd133d33922556c11af7bbec48734e53 (patch) | |
| tree | 7fb09746d84f9a68e9d8e4c9e1d1e871c6b17ec0 /include/net/ipv6.h | |
| parent | af8ff60bcc47e0e7e97fc2a39fdee68f3340d23b (diff) | |
| parent | 243d4c9490e60a84e3812cad8786f23da374adac (diff) | |
Merge branch 'android-3.10' into dev-kernel-3.10
Bug 1456092
Change-Id: Idd03c5e52e7aac49f4adede54802ca66f22d2ee3
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
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 97a5e5c04d7d..08a85885dbb9 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -261,10 +261,10 @@ static inline void fl6_sock_release(struct ip6_flowlabel *fl) extern void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info); int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, - struct icmp6hdr *thdr, int len); + struct icmp6hdr *thdr, int len); struct dst_entry *icmpv6_route_lookup(struct net *net, struct sk_buff *skb, - struct sock *sk, struct flowi6 *fl6); + struct sock *sk, struct flowi6 *fl6); extern int ip6_ra_control(struct sock *sk, int sel); |