diff options
Diffstat (limited to 'target/linux/generic')
4 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch index 8e776383d1..7dc1dd7f46 100644 --- a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch +++ b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch @@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6, --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str +@@ -419,7 +419,7 @@ static inline int ip6_forward_finish(str return dst_output(net, sk, skb); } @@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> { unsigned int mtu; struct inet6_dev *idev; -@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward( +@@ -439,6 +439,7 @@ static unsigned int ip6_dst_mtu_forward( return mtu; } diff --git a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch index 1c52cf51c6..b38ff36414 100644 --- a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch +++ b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6, --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -381,28 +381,6 @@ static inline int ip6_forward_finish(str +@@ -419,28 +419,6 @@ static inline int ip6_forward_finish(str return dst_output(net, sk, skb); } diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 93d63534eb..cd10a3d6cb 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2544,6 +2544,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2560,6 +2560,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2675,16 +2679,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2691,16 +2695,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -503,6 +504,22 @@ skb_fail: +@@ -508,6 +509,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); diff --git a/target/linux/generic/pending-4.14/655-increase_skb_pad.patch b/target/linux/generic/pending-4.14/655-increase_skb_pad.patch index bccce61083..6eee01ac73 100644 --- a/target/linux/generic/pending-4.14/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-4.14/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2508,7 +2508,7 @@ static inline int pskb_network_may_pull( +@@ -2524,7 +2524,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD |