Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
include
/
linux
/
ipv6.h
diff --git
a/kernel/include/linux/ipv6.h
b/kernel/include/linux/ipv6.h
index
82806c6
..
402753b
100644
(file)
--- a/
kernel/include/linux/ipv6.h
+++ b/
kernel/include/linux/ipv6.h
@@
-29,7
+29,9
@@
struct ipv6_devconf {
__s32 max_desync_factor;
__s32 max_addresses;
__s32 accept_ra_defrtr;
__s32 max_desync_factor;
__s32 max_addresses;
__s32 accept_ra_defrtr;
+ __s32 accept_ra_min_hop_limit;
__s32 accept_ra_pinfo;
__s32 accept_ra_pinfo;
+ __s32 ignore_routes_with_linkdown;
#ifdef CONFIG_IPV6_ROUTER_PREF
__s32 accept_ra_rtr_pref;
__s32 rtr_probe_interval;
#ifdef CONFIG_IPV6_ROUTER_PREF
__s32 accept_ra_rtr_pref;
__s32 rtr_probe_interval;
@@
-57,6
+59,7
@@
struct ipv6_devconf {
bool initialized;
struct in6_addr secret;
} stable_secret;
bool initialized;
struct in6_addr secret;
} stable_secret;
+ __s32 use_oif_addrs_only;
void *sysctl;
};
void *sysctl;
};
@@
-94,7
+97,6
@@
static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb)
struct inet6_skb_parm {
int iif;
__be16 ra;
struct inet6_skb_parm {
int iif;
__be16 ra;
- __u16 hop;
__u16 dst0;
__u16 srcrt;
__u16 dst1;
__u16 dst0;
__u16 srcrt;
__u16 dst1;
@@
-111,6
+113,7
@@
struct inet6_skb_parm {
#define IP6SKB_REROUTED 4
#define IP6SKB_ROUTERALERT 8
#define IP6SKB_FRAGMENTED 16
#define IP6SKB_REROUTED 4
#define IP6SKB_ROUTERALERT 8
#define IP6SKB_FRAGMENTED 16
+#define IP6SKB_HOPBYHOP 32
};
#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))
};
#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))
@@
-224,7
+227,7
@@
struct ipv6_pinfo {
struct ipv6_ac_socklist *ipv6_ac_list;
struct ipv6_fl_socklist __rcu *ipv6_fl_list;
struct ipv6_ac_socklist *ipv6_ac_list;
struct ipv6_fl_socklist __rcu *ipv6_fl_list;
- struct ipv6_txoptions *opt;
+ struct ipv6_txoptions
__rcu
*opt;
struct sk_buff *pktoptions;
struct sk_buff *rxpmtu;
struct inet6_cork cork;
struct sk_buff *pktoptions;
struct sk_buff *rxpmtu;
struct inet6_cork cork;
@@
-261,9
+264,9
@@
struct tcp6_timewait_sock {
};
#if IS_ENABLED(CONFIG_IPV6)
};
#if IS_ENABLED(CONFIG_IPV6)
-static inline struct ipv6_pinfo *
inet6_sk(const struct sock *__sk)
+static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk)
{
{
- return
inet_sk(__sk)->pinet6
;
+ return
sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL
;
}
static inline struct raw6_sock *raw6_sk(const struct sock *sk)
}
static inline struct raw6_sock *raw6_sk(const struct sock *sk)