|
|
|
|
@ -1,7 +1,5 @@
|
|
|
|
|
Index: linux-4.14.61/arch/mips/include/asm/checksum.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/arch/mips/include/asm/checksum.h
|
|
|
|
|
+++ linux-4.14.61/arch/mips/include/asm/checksum.h
|
|
|
|
|
--- a/arch/mips/include/asm/checksum.h
|
|
|
|
|
+++ b/arch/mips/include/asm/checksum.h
|
|
|
|
|
@@ -134,26 +134,30 @@ static inline __sum16 ip_fast_csum(const
|
|
|
|
|
const unsigned int *stop = word + ihl;
|
|
|
|
|
unsigned int csum;
|
|
|
|
|
@ -118,10 +116,8 @@ Index: linux-4.14.61/arch/mips/include/asm/checksum.h
|
|
|
|
|
#include <asm-generic/checksum.h>
|
|
|
|
|
#endif /* CONFIG_GENERIC_CSUM */
|
|
|
|
|
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/ip.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/ip.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/ip.h
|
|
|
|
|
--- a/include/uapi/linux/ip.h
|
|
|
|
|
+++ b/include/uapi/linux/ip.h
|
|
|
|
|
@@ -103,7 +103,7 @@ struct iphdr {
|
|
|
|
|
__be32 saddr;
|
|
|
|
|
__be32 daddr;
|
|
|
|
|
@ -131,10 +127,8 @@ Index: linux-4.14.61/include/uapi/linux/ip.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct ip_auth_hdr {
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/ipv6.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/ipv6.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/ipv6.h
|
|
|
|
|
--- a/include/uapi/linux/ipv6.h
|
|
|
|
|
+++ b/include/uapi/linux/ipv6.h
|
|
|
|
|
@@ -131,7 +131,7 @@ struct ipv6hdr {
|
|
|
|
|
|
|
|
|
|
struct in6_addr saddr;
|
|
|
|
|
@ -144,10 +138,8 @@ Index: linux-4.14.61/include/uapi/linux/ipv6.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* index values for the variables in ipv6_devconf */
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/tcp.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/tcp.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/tcp.h
|
|
|
|
|
--- a/include/uapi/linux/tcp.h
|
|
|
|
|
+++ b/include/uapi/linux/tcp.h
|
|
|
|
|
@@ -55,7 +55,7 @@ struct tcphdr {
|
|
|
|
|
__be16 window;
|
|
|
|
|
__sum16 check;
|
|
|
|
|
@ -166,10 +158,8 @@ Index: linux-4.14.61/include/uapi/linux/tcp.h
|
|
|
|
|
|
|
|
|
|
#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3])
|
|
|
|
|
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/udp.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/udp.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/udp.h
|
|
|
|
|
--- a/include/uapi/linux/udp.h
|
|
|
|
|
+++ b/include/uapi/linux/udp.h
|
|
|
|
|
@@ -25,7 +25,7 @@ struct udphdr {
|
|
|
|
|
__be16 dest;
|
|
|
|
|
__be16 len;
|
|
|
|
|
@ -179,10 +169,8 @@ Index: linux-4.14.61/include/uapi/linux/udp.h
|
|
|
|
|
|
|
|
|
|
/* UDP socket options */
|
|
|
|
|
#define UDP_CORK 1 /* Never send partially complete segments */
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
@@ -48,8 +48,8 @@ static bool ipv4_pkt_to_tuple(const stru
|
|
|
|
|
if (ap == NULL)
|
|
|
|
|
return false;
|
|
|
|
|
@ -194,10 +182,8 @@ Index: linux-4.14.61/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/icmp.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/icmp.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/icmp.h
|
|
|
|
|
--- a/include/uapi/linux/icmp.h
|
|
|
|
|
+++ b/include/uapi/linux/icmp.h
|
|
|
|
|
@@ -82,7 +82,7 @@ struct icmphdr {
|
|
|
|
|
} frag;
|
|
|
|
|
__u8 reserved[4];
|
|
|
|
|
@ -207,10 +193,8 @@ Index: linux-4.14.61/include/uapi/linux/icmp.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/in6.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/in6.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/in6.h
|
|
|
|
|
--- a/include/uapi/linux/in6.h
|
|
|
|
|
+++ b/include/uapi/linux/in6.h
|
|
|
|
|
@@ -43,7 +43,7 @@ struct in6_addr {
|
|
|
|
|
#define s6_addr16 in6_u.u6_addr16
|
|
|
|
|
#define s6_addr32 in6_u.u6_addr32
|
|
|
|
|
@ -220,10 +204,8 @@ Index: linux-4.14.61/include/uapi/linux/in6.h
|
|
|
|
|
#endif /* __UAPI_DEF_IN6_ADDR */
|
|
|
|
|
|
|
|
|
|
#if __UAPI_DEF_SOCKADDR_IN6
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/tcp_ipv6.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/tcp_ipv6.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/tcp_ipv6.c
|
|
|
|
|
--- a/net/ipv6/tcp_ipv6.c
|
|
|
|
|
+++ b/net/ipv6/tcp_ipv6.c
|
|
|
|
|
@@ -39,6 +39,7 @@
|
|
|
|
|
#include <linux/ipsec.h>
|
|
|
|
|
#include <linux/times.h>
|
|
|
|
|
@ -247,10 +229,8 @@ Index: linux-4.14.61/net/ipv6/tcp_ipv6.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
|
|
Index: linux-4.14.61/include/linux/ipv6.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/linux/ipv6.h
|
|
|
|
|
+++ linux-4.14.61/include/linux/ipv6.h
|
|
|
|
|
--- a/include/linux/ipv6.h
|
|
|
|
|
+++ b/include/linux/ipv6.h
|
|
|
|
|
@@ -6,6 +6,7 @@
|
|
|
|
|
|
|
|
|
|
#define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
|
|
|
|
|
@ -259,10 +239,8 @@ Index: linux-4.14.61/include/linux/ipv6.h
|
|
|
|
|
/*
|
|
|
|
|
* This structure contains configuration options per IPv6 link.
|
|
|
|
|
*/
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/datagram.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/datagram.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/datagram.c
|
|
|
|
|
--- a/net/ipv6/datagram.c
|
|
|
|
|
+++ b/net/ipv6/datagram.c
|
|
|
|
|
@@ -485,7 +485,7 @@ int ipv6_recv_error(struct sock *sk, str
|
|
|
|
|
ipv6_iface_scope_id(&sin->sin6_addr,
|
|
|
|
|
IP6CB(skb)->iif);
|
|
|
|
|
@ -287,10 +265,8 @@ Index: linux-4.14.61/net/ipv6/datagram.c
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case IPV6_2292HOPOPTS:
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/ip6_gre.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/ip6_gre.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/ip6_gre.c
|
|
|
|
|
--- a/net/ipv6/ip6_gre.c
|
|
|
|
|
+++ b/net/ipv6/ip6_gre.c
|
|
|
|
|
@@ -397,7 +397,7 @@ static void ip6gre_err(struct sk_buff *s
|
|
|
|
|
return;
|
|
|
|
|
ipv6h = (const struct ipv6hdr *)skb->data;
|
|
|
|
|
@ -300,10 +276,8 @@ Index: linux-4.14.61/net/ipv6/ip6_gre.c
|
|
|
|
|
|
|
|
|
|
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
|
|
|
|
|
key, greh->protocol);
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/exthdrs.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/exthdrs.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/exthdrs.c
|
|
|
|
|
--- a/net/ipv6/exthdrs.c
|
|
|
|
|
+++ b/net/ipv6/exthdrs.c
|
|
|
|
|
@@ -733,7 +733,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
|
|
|
|
|
goto drop;
|
|
|
|
|
}
|
|
|
|
|
@ -313,10 +287,8 @@ Index: linux-4.14.61/net/ipv6/exthdrs.c
|
|
|
|
|
if (pkt_len <= IPV6_MAXPLEN) {
|
|
|
|
|
__IP6_INC_STATS(net, ipv6_skb_idev(skb),
|
|
|
|
|
IPSTATS_MIB_INHDRERRORS);
|
|
|
|
|
Index: linux-4.14.61/include/linux/types.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/linux/types.h
|
|
|
|
|
+++ linux-4.14.61/include/linux/types.h
|
|
|
|
|
--- a/include/linux/types.h
|
|
|
|
|
+++ b/include/linux/types.h
|
|
|
|
|
@@ -229,5 +229,11 @@ struct callback_head {
|
|
|
|
|
typedef void (*rcu_callback_t)(struct rcu_head *head);
|
|
|
|
|
typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
|
|
|
|
|
@ -329,10 +301,8 @@ Index: linux-4.14.61/include/linux/types.h
|
|
|
|
|
+
|
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
|
#endif /* _LINUX_TYPES_H */
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/af_inet.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/af_inet.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/af_inet.c
|
|
|
|
|
--- a/net/ipv4/af_inet.c
|
|
|
|
|
+++ b/net/ipv4/af_inet.c
|
|
|
|
|
@@ -1351,8 +1351,8 @@ struct sk_buff **inet_gro_receive(struct
|
|
|
|
|
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
@ -344,10 +314,8 @@ Index: linux-4.14.61/net/ipv4/af_inet.c
|
|
|
|
|
id >>= 16;
|
|
|
|
|
|
|
|
|
|
for (p = *head; p; p = p->next) {
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/route.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/route.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/route.c
|
|
|
|
|
--- a/net/ipv4/route.c
|
|
|
|
|
+++ b/net/ipv4/route.c
|
|
|
|
|
@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look
|
|
|
|
|
else if (skb)
|
|
|
|
|
pkey = &ip_hdr(skb)->daddr;
|
|
|
|
|
@ -357,10 +325,8 @@ Index: linux-4.14.61/net/ipv4/route.c
|
|
|
|
|
if (n)
|
|
|
|
|
return n;
|
|
|
|
|
return neigh_create(&arp_tbl, pkey, dev);
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/tcp_output.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/tcp_output.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/tcp_output.c
|
|
|
|
|
--- a/net/ipv4/tcp_output.c
|
|
|
|
|
+++ b/net/ipv4/tcp_output.c
|
|
|
|
|
@@ -454,48 +454,53 @@ static void tcp_options_write(__be32 *pt
|
|
|
|
|
u16 options = opts->options; /* mungable copy */
|
|
|
|
|
|
|
|
|
|
@ -480,10 +446,8 @@ Index: linux-4.14.61/net/ipv4/tcp_output.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memcpy(p, foc->val, foc->len);
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/igmp.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/igmp.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/igmp.c
|
|
|
|
|
--- a/net/ipv4/igmp.c
|
|
|
|
|
+++ b/net/ipv4/igmp.c
|
|
|
|
|
@@ -537,7 +537,7 @@ static struct sk_buff *add_grec(struct s
|
|
|
|
|
if (!skb)
|
|
|
|
|
return NULL;
|
|
|
|
|
@ -493,10 +457,8 @@ Index: linux-4.14.61/net/ipv4/igmp.c
|
|
|
|
|
scount++; stotal++;
|
|
|
|
|
if ((type == IGMPV3_ALLOW_NEW_SOURCES ||
|
|
|
|
|
type == IGMPV3_BLOCK_OLD_SOURCES) && psf->sf_crcount) {
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/igmp.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/igmp.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/igmp.h
|
|
|
|
|
--- a/include/uapi/linux/igmp.h
|
|
|
|
|
+++ b/include/uapi/linux/igmp.h
|
|
|
|
|
@@ -33,7 +33,7 @@ struct igmphdr {
|
|
|
|
|
__u8 code; /* For newer IGMP */
|
|
|
|
|
__sum16 csum;
|
|
|
|
|
@ -533,10 +495,8 @@ Index: linux-4.14.61/include/uapi/linux/igmp.h
|
|
|
|
|
|
|
|
|
|
#define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
|
|
|
|
|
#define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
|
|
|
|
|
Index: linux-4.14.61/net/core/flow_dissector.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/core/flow_dissector.c
|
|
|
|
|
+++ linux-4.14.61/net/core/flow_dissector.c
|
|
|
|
|
--- a/net/core/flow_dissector.c
|
|
|
|
|
+++ b/net/core/flow_dissector.c
|
|
|
|
|
@@ -108,7 +108,7 @@ __be32 __skb_flow_get_ports(const struct
|
|
|
|
|
ports = __skb_header_pointer(skb, thoff + poff,
|
|
|
|
|
sizeof(_ports), data, hlen, &_ports);
|
|
|
|
|
@ -546,10 +506,8 @@ Index: linux-4.14.61/net/core/flow_dissector.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/icmpv6.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/icmpv6.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/icmpv6.h
|
|
|
|
|
--- a/include/uapi/linux/icmpv6.h
|
|
|
|
|
+++ b/include/uapi/linux/icmpv6.h
|
|
|
|
|
@@ -77,7 +77,7 @@ struct icmp6hdr {
|
|
|
|
|
#define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
|
|
|
|
|
#define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
|
|
|
|
|
@ -559,10 +517,8 @@ Index: linux-4.14.61/include/uapi/linux/icmpv6.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define ICMPV6_ROUTER_PREF_LOW 0x3
|
|
|
|
|
Index: linux-4.14.61/include/net/ndisc.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/ndisc.h
|
|
|
|
|
+++ linux-4.14.61/include/net/ndisc.h
|
|
|
|
|
--- a/include/net/ndisc.h
|
|
|
|
|
+++ b/include/net/ndisc.h
|
|
|
|
|
@@ -89,7 +89,7 @@ struct ra_msg {
|
|
|
|
|
struct icmp6hdr icmph;
|
|
|
|
|
__be32 reachable_time;
|
|
|
|
|
@ -587,10 +543,8 @@ Index: linux-4.14.61/include/net/ndisc.h
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
|
|
|
|
|
Index: linux-4.14.61/net/sched/cls_u32.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/sched/cls_u32.c
|
|
|
|
|
+++ linux-4.14.61/net/sched/cls_u32.c
|
|
|
|
|
--- a/net/sched/cls_u32.c
|
|
|
|
|
+++ b/net/sched/cls_u32.c
|
|
|
|
|
@@ -165,7 +165,7 @@ next_knode:
|
|
|
|
|
data = skb_header_pointer(skb, toff, 4, &hdata);
|
|
|
|
|
if (!data)
|
|
|
|
|
@ -611,10 +565,8 @@ Index: linux-4.14.61/net/sched/cls_u32.c
|
|
|
|
|
}
|
|
|
|
|
if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
|
|
|
|
|
goto next_ht;
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/ip6_offload.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/ip6_offload.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/ip6_offload.c
|
|
|
|
|
--- a/net/ipv6/ip6_offload.c
|
|
|
|
|
+++ b/net/ipv6/ip6_offload.c
|
|
|
|
|
@@ -220,7 +220,7 @@ static struct sk_buff **ipv6_gro_receive
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
@ -624,10 +576,8 @@ Index: linux-4.14.61/net/ipv6/ip6_offload.c
|
|
|
|
|
|
|
|
|
|
/* All fields must match except length and Traffic Class.
|
|
|
|
|
* XXX skbs on the gro_list have all been parsed and pulled
|
|
|
|
|
Index: linux-4.14.61/include/net/addrconf.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/addrconf.h
|
|
|
|
|
+++ linux-4.14.61/include/net/addrconf.h
|
|
|
|
|
--- a/include/net/addrconf.h
|
|
|
|
|
+++ b/include/net/addrconf.h
|
|
|
|
|
@@ -47,7 +47,7 @@ struct prefix_info {
|
|
|
|
|
__be32 reserved2;
|
|
|
|
|
|
|
|
|
|
@ -637,10 +587,8 @@ Index: linux-4.14.61/include/net/addrconf.h
|
|
|
|
|
|
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
|
#include <net/if_inet6.h>
|
|
|
|
|
Index: linux-4.14.61/include/net/inet_ecn.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/inet_ecn.h
|
|
|
|
|
+++ linux-4.14.61/include/net/inet_ecn.h
|
|
|
|
|
--- a/include/net/inet_ecn.h
|
|
|
|
|
+++ b/include/net/inet_ecn.h
|
|
|
|
|
@@ -125,9 +125,9 @@ static inline int IP6_ECN_set_ce(struct
|
|
|
|
|
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
|
|
|
|
|
return 0;
|
|
|
|
|
@ -662,10 +610,8 @@ Index: linux-4.14.61/include/net/inet_ecn.h
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
|
|
|
|
|
Index: linux-4.14.61/include/net/ipv6.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/ipv6.h
|
|
|
|
|
+++ linux-4.14.61/include/net/ipv6.h
|
|
|
|
|
--- a/include/net/ipv6.h
|
|
|
|
|
+++ b/include/net/ipv6.h
|
|
|
|
|
@@ -108,7 +108,7 @@ struct frag_hdr {
|
|
|
|
|
__u8 reserved;
|
|
|
|
|
__be16 frag_off;
|
|
|
|
|
@ -744,10 +690,8 @@ Index: linux-4.14.61/include/net/ipv6.h
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline u8 ip6_tclass(__be32 flowinfo)
|
|
|
|
|
Index: linux-4.14.61/include/net/secure_seq.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/secure_seq.h
|
|
|
|
|
+++ linux-4.14.61/include/net/secure_seq.h
|
|
|
|
|
--- a/include/net/secure_seq.h
|
|
|
|
|
+++ b/include/net/secure_seq.h
|
|
|
|
|
@@ -3,6 +3,7 @@
|
|
|
|
|
#define _NET_SECURE_SEQ
|
|
|
|
|
|
|
|
|
|
@ -756,10 +700,8 @@ Index: linux-4.14.61/include/net/secure_seq.h
|
|
|
|
|
|
|
|
|
|
u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
|
|
|
|
|
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/in.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/in.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/in.h
|
|
|
|
|
--- a/include/uapi/linux/in.h
|
|
|
|
|
+++ b/include/uapi/linux/in.h
|
|
|
|
|
@@ -84,7 +84,7 @@ enum {
|
|
|
|
|
/* Internet address. */
|
|
|
|
|
struct in_addr {
|
|
|
|
|
@ -769,10 +711,8 @@ Index: linux-4.14.61/include/uapi/linux/in.h
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define IP_TOS 1
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/ip6_fib.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/ip6_fib.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/ip6_fib.c
|
|
|
|
|
--- a/net/ipv6/ip6_fib.c
|
|
|
|
|
+++ b/net/ipv6/ip6_fib.c
|
|
|
|
|
@@ -137,7 +137,7 @@ static __be32 addr_bit_set(const void *t
|
|
|
|
|
* See include/asm-generic/bitops/le.h.
|
|
|
|
|
*/
|
|
|
|
|
@ -782,10 +722,8 @@ Index: linux-4.14.61/net/ipv6/ip6_fib.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct fib6_node *node_alloc(void)
|
|
|
|
|
Index: linux-4.14.61/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
+++ linux-4.14.61/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
--- a/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
@@ -447,7 +447,7 @@ static void tcp_sack(const struct sk_buf
|
|
|
|
|
|
|
|
|
|
/* Fast path for timestamp-only option */
|
|
|
|
|
@ -795,10 +733,8 @@ Index: linux-4.14.61/net/netfilter/nf_conntrack_proto_tcp.c
|
|
|
|
|
| (TCPOPT_NOP << 16)
|
|
|
|
|
| (TCPOPT_TIMESTAMP << 8)
|
|
|
|
|
| TCPOLEN_TIMESTAMP))
|
|
|
|
|
Index: linux-4.14.61/net/xfrm/xfrm_input.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/xfrm/xfrm_input.c
|
|
|
|
|
+++ linux-4.14.61/net/xfrm/xfrm_input.c
|
|
|
|
|
--- a/net/xfrm/xfrm_input.c
|
|
|
|
|
+++ b/net/xfrm/xfrm_input.c
|
|
|
|
|
@@ -193,8 +193,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
|
|
|
|
|
if (!pskb_may_pull(skb, hlen))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
@ -810,10 +746,8 @@ Index: linux-4.14.61/net/xfrm/xfrm_input.c
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/tcp_input.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/tcp_input.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/tcp_input.c
|
|
|
|
|
--- a/net/ipv4/tcp_input.c
|
|
|
|
|
+++ b/net/ipv4/tcp_input.c
|
|
|
|
|
@@ -3858,14 +3858,16 @@ static bool tcp_parse_aligned_timestamp(
|
|
|
|
|
{
|
|
|
|
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
|
|
|
|
@ -836,10 +770,8 @@ Index: linux-4.14.61/net/ipv4/tcp_input.c
|
|
|
|
|
else
|
|
|
|
|
tp->rx_opt.rcv_tsecr = 0;
|
|
|
|
|
return true;
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/if_pppox.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/if_pppox.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/if_pppox.h
|
|
|
|
|
--- a/include/uapi/linux/if_pppox.h
|
|
|
|
|
+++ b/include/uapi/linux/if_pppox.h
|
|
|
|
|
@@ -51,6 +51,7 @@ struct pppoe_addr {
|
|
|
|
|
*/
|
|
|
|
|
struct pptp_addr {
|
|
|
|
|
@ -848,10 +780,8 @@ Index: linux-4.14.61/include/uapi/linux/if_pppox.h
|
|
|
|
|
struct in_addr sin_addr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
--- a/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
+++ b/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
@@ -66,9 +66,9 @@ static void dump_ipv6_packet(struct nf_l
|
|
|
|
|
/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
|
|
|
|
|
nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
|
|
|
|
|
@ -864,10 +794,8 @@ Index: linux-4.14.61/net/ipv6/netfilter/nf_log_ipv6.c
|
|
|
|
|
|
|
|
|
|
fragment = 0;
|
|
|
|
|
ptr = ip6hoff + sizeof(struct ipv6hdr);
|
|
|
|
|
Index: linux-4.14.61/include/net/neighbour.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/net/neighbour.h
|
|
|
|
|
+++ linux-4.14.61/include/net/neighbour.h
|
|
|
|
|
--- a/include/net/neighbour.h
|
|
|
|
|
+++ b/include/net/neighbour.h
|
|
|
|
|
@@ -265,8 +265,10 @@ static inline bool neigh_key_eq128(const
|
|
|
|
|
const u32 *n32 = (const u32 *)n->primary_key;
|
|
|
|
|
const u32 *p32 = pkey;
|
|
|
|
|
@ -881,10 +809,8 @@ Index: linux-4.14.61/include/net/neighbour.h
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct neighbour *___neigh_lookup_noref(
|
|
|
|
|
Index: linux-4.14.61/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
+++ linux-4.14.61/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
--- a/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
+++ b/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
@@ -70,7 +70,7 @@ struct arpt_arp {
|
|
|
|
|
__u8 flags;
|
|
|
|
|
/* Inverse flags */
|
|
|
|
|
@ -894,10 +820,8 @@ Index: linux-4.14.61/include/uapi/linux/netfilter_arp/arp_tables.h
|
|
|
|
|
|
|
|
|
|
/* Values for "flag" field in struct arpt_ip (general arp structure).
|
|
|
|
|
* No flags defined yet.
|
|
|
|
|
Index: linux-4.14.61/net/core/utils.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/core/utils.c
|
|
|
|
|
+++ linux-4.14.61/net/core/utils.c
|
|
|
|
|
--- a/net/core/utils.c
|
|
|
|
|
+++ b/net/core/utils.c
|
|
|
|
|
@@ -424,8 +424,14 @@ void inet_proto_csum_replace16(__sum16 *
|
|
|
|
|
bool pseudohdr)
|
|
|
|
|
{
|
|
|
|
|
@ -915,10 +839,8 @@ Index: linux-4.14.61/net/core/utils.c
|
|
|
|
|
};
|
|
|
|
|
if (skb->ip_summed != CHECKSUM_PARTIAL) {
|
|
|
|
|
*sum = csum_fold(csum_partial(diff, sizeof(diff),
|
|
|
|
|
Index: linux-4.14.61/drivers/net/vxlan.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/drivers/net/vxlan.c
|
|
|
|
|
+++ linux-4.14.61/drivers/net/vxlan.c
|
|
|
|
|
--- a/drivers/net/vxlan.c
|
|
|
|
|
+++ b/drivers/net/vxlan.c
|
|
|
|
|
@@ -1857,15 +1857,15 @@ static int vxlan_build_skb(struct sk_buf
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
@ -939,10 +861,8 @@ Index: linux-4.14.61/drivers/net/vxlan.c
|
|
|
|
|
|
|
|
|
|
if (!skb_is_gso(skb)) {
|
|
|
|
|
skb->ip_summed = CHECKSUM_NONE;
|
|
|
|
|
Index: linux-4.14.61/include/linux/etherdevice.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/include/linux/etherdevice.h
|
|
|
|
|
+++ linux-4.14.61/include/linux/etherdevice.h
|
|
|
|
|
--- a/include/linux/etherdevice.h
|
|
|
|
|
+++ b/include/linux/etherdevice.h
|
|
|
|
|
@@ -480,7 +480,7 @@ static inline bool is_etherdev_addr(cons
|
|
|
|
|
* @b: Pointer to Ethernet header
|
|
|
|
|
*
|
|
|
|
|
@ -969,10 +889,8 @@ Index: linux-4.14.61/include/linux/etherdevice.h
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Index: linux-4.14.61/net/ipv4/tcp_offload.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv4/tcp_offload.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv4/tcp_offload.c
|
|
|
|
|
--- a/net/ipv4/tcp_offload.c
|
|
|
|
|
+++ b/net/ipv4/tcp_offload.c
|
|
|
|
|
@@ -226,7 +226,7 @@ struct sk_buff **tcp_gro_receive(struct
|
|
|
|
|
|
|
|
|
|
th2 = tcp_hdr(p);
|
|
|
|
|
@ -993,10 +911,8 @@ Index: linux-4.14.61/net/ipv4/tcp_offload.c
|
|
|
|
|
|
|
|
|
|
/* When we receive our second frame we can made a decision on if we
|
|
|
|
|
* continue this flow as an atomic flow with a fixed ID or if we use
|
|
|
|
|
Index: linux-4.14.61/net/ipv6/netfilter/ip6table_mangle.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-4.14.61.orig/net/ipv6/netfilter/ip6table_mangle.c
|
|
|
|
|
+++ linux-4.14.61/net/ipv6/netfilter/ip6table_mangle.c
|
|
|
|
|
--- a/net/ipv6/netfilter/ip6table_mangle.c
|
|
|
|
|
+++ b/net/ipv6/netfilter/ip6table_mangle.c
|
|
|
|
|
@@ -50,7 +50,7 @@ ip6t_mangle_out(struct sk_buff *skb, con
|
|
|
|
|
hop_limit = ipv6_hdr(skb)->hop_limit;
|
|
|
|
|
|
|
|
|
|
|
Koen Vandeputte
6 years ago