Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25d590e3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: restore upstream changes which break routing in tunnel scenarios"

parents b3ede85d 709d3a4e

fs/f2fs/f2fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,6 @@ static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode) 
int f2fs_inode_dirtied(struct inode *, bool);

void f2fs_inode_synced(struct inode *);

int f2fs_commit_super(struct f2fs_sb_info *, bool);

loff_t max_file_size(unsigned bits);

int f2fs_sync_fs(struct super_block *, int);

extern __printf(3, 4)

void f2fs_msg(struct super_block *, const char *, const char *, ...);

include/net/xfrm.h

+3 −2
Original line number Diff line number Diff line
@@ -285,10 +285,11 @@ struct xfrm_policy_afinfo { 
	unsigned short		family;

	struct dst_ops		*dst_ops;

	void			(*garbage_collect)(struct net *net);

	struct dst_entry	*(*dst_lookup)(struct net *net, int tos,

	struct dst_entry	*(*dst_lookup)(struct net *net,

					       int tos, int oif,

					       const xfrm_address_t *saddr,

					       const xfrm_address_t *daddr);

	int			(*get_saddr)(struct net *net,

	int			(*get_saddr)(struct net *net, int oif,

					     xfrm_address_t *saddr,

					     xfrm_address_t *daddr);

	void			(*decode_session)(struct sk_buff *skb,

net/ipv4/xfrm4_policy.c

+6 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
static struct xfrm_policy_afinfo xfrm4_policy_afinfo;



static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4,

					    int tos,

					    int tos, int oif,

					    const xfrm_address_t *saddr,

					    const xfrm_address_t *daddr)

{
@@ -29,6 +29,7 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, 
	memset(fl4, 0, sizeof(*fl4));

	fl4->daddr = daddr->a4;

	fl4->flowi4_tos = tos;

	fl4->flowi4_oif = oif;

	if (saddr)

		fl4->saddr = saddr->a4;
@@ -41,22 +42,22 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, 
	return ERR_CAST(rt);

}



static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,

static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, int oif,

					  const xfrm_address_t *saddr,

					  const xfrm_address_t *daddr)

{

	struct flowi4 fl4;



	return __xfrm4_dst_lookup(net, &fl4, tos, saddr, daddr);

	return __xfrm4_dst_lookup(net, &fl4, tos, oif, saddr, daddr);

}



static int xfrm4_get_saddr(struct net *net,

static int xfrm4_get_saddr(struct net *net, int oif,

			   xfrm_address_t *saddr, xfrm_address_t *daddr)

{

	struct dst_entry *dst;

	struct flowi4 fl4;



	dst = __xfrm4_dst_lookup(net, &fl4, 0, NULL, daddr);

	dst = __xfrm4_dst_lookup(net, &fl4, 0, oif, NULL, daddr);

	if (IS_ERR(dst))

		return -EHOSTUNREACH;

net/ipv6/ip6_output.c

+2 −1
Original line number Diff line number Diff line
@@ -895,7 +895,8 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, 
#ifdef CONFIG_IPV6_SUBTREES

	    ip6_rt_check(&rt->rt6i_src, &fl6->saddr, np->saddr_cache) ||

#endif

	    (fl6->flowi6_oif && fl6->flowi6_oif != dst->dev->ifindex)) {

	   (!(fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF) &&

	      (fl6->flowi6_oif && fl6->flowi6_oif != dst->dev->ifindex))) {

		dst_release(dst);

		dst = NULL;

	}

net/ipv6/route.c

+3 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,9 @@ static struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, 
	fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	saved_fn = fn;



	if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF)

		oif = 0;



redo_rt6_select:

	rt = rt6_select(fn, oif, strict);

	if (rt->rt6i_nsiblings)