projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
ipv6.h
diff --git
a/include/net/ipv6.h
b/include/net/ipv6.h
index a2db816e8461cff706f23c725cf69372ab8bfcaa..97f472012438b10a0bcbff9eef6c553d7357ad35 100644
(file)
--- a/
include/net/ipv6.h
+++ b/
include/net/ipv6.h
@@
-121,6
+121,7
@@
struct frag_hdr {
/* sysctls */
extern int sysctl_mld_max_msf;
/* sysctls */
extern int sysctl_mld_max_msf;
+extern int sysctl_mld_qrv;
#define _DEVINC(net, statname, modifier, idev, field) \
({ \
#define _DEVINC(net, statname, modifier, idev, field) \
({ \
@@
-287,7
+288,8
@@
struct ipv6_txoptions *ipv6_renew_options(struct sock *sk,
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
struct ipv6_txoptions *opt);
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
struct ipv6_txoptions *opt);
-bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb);
+bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,
+ const struct inet6_skb_parm *opt);
static inline bool ipv6_accept_ra(struct inet6_dev *idev)
{
static inline bool ipv6_accept_ra(struct inet6_dev *idev)
{