Merge branch 'linux-mainline' into android-mainline-tmp

Change-Id: I4380c68c3474026a42ffa9f95c525f9a563ba7a3
This commit is contained in:
Todd Kjos
2019-05-03 12:22:22 -07:00
24258 changed files with 1692606 additions and 822161 deletions

View File

@@ -105,6 +105,12 @@ static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb)
return (struct ipv6hdr *)skb_transport_header(skb);
}
static inline unsigned int ipv6_transport_len(const struct sk_buff *skb)
{
return ntohs(ipv6_hdr(skb)->payload_len) + sizeof(struct ipv6hdr) -
skb_network_header_len(skb);
}
/*
This structure contains results of exthdrs parsing
as offsets from skb->nh.
@@ -275,7 +281,9 @@ struct ipv6_pinfo {
*/
dontfrag:1,
autoflowlabel:1,
autoflowlabel_set:1;
autoflowlabel_set:1,
mc_all:1,
rtalert_isolate:1;
__u8 min_hopcount;
__u8 tclass;
__be32 rcv_flowinfo;