diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-07-14 17:42:28 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-17 13:27:03 +0200 |
| commit | b71767d8e047b06668ca8b7b7922f6df238ab659 (patch) | |
| tree | 87915374bb00d4482bce6e654b1d4a0876c3d347 /target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
| parent | 2e324c0a2c927461ab74f688fd878dce8fa52af2 (diff) | |
| download | upstream-b71767d8e047b06668ca8b7b7922f6df238ab659.tar.gz upstream-b71767d8e047b06668ca8b7b7922f6df238ab659.tar.bz2 upstream-b71767d8e047b06668ca8b7b7922f6df238ab659.zip | |
kernel: bump 5.10 to 5.10.50
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index ddb94fbe55..89eb7d61b3 100644 --- a/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -311,7 +311,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> /** * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * @t: the outgoing tunnel device -@@ -1306,6 +1454,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str +@@ -1304,6 +1452,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str u8 protocol) { struct ip6_tnl *t = netdev_priv(dev); @@ -319,7 +319,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> struct ipv6hdr *ipv6h; const struct iphdr *iph; int encap_limit = -1; -@@ -1405,6 +1554,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str +@@ -1403,6 +1552,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield); |