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

Commit f2d74cf8 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

bridge: Cache net in br_nf_pre_routing_finish 



This is prep work for passing net to the netfilter hooks.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6532948b

net/bridge/br_netfilter_hooks.c

+2 −1
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ static int br_nf_pre_routing_finish(struct sock *sk, struct sk_buff *skb) 
{

	struct net_device *dev = skb->dev;

	struct iphdr *iph = ip_hdr(skb);

	struct net *net = dev_net(dev);

	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);

	struct rtable *rt;

	int err;
@@ -371,7 +372,7 @@ static int br_nf_pre_routing_finish(struct sock *sk, struct sk_buff *skb) 
			if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev))

				goto free_skb;



			rt = ip_route_output(dev_net(dev), iph->daddr, 0,

			rt = ip_route_output(net, iph->daddr, 0,

					     RT_TOS(iph->tos), 0);

			if (!IS_ERR(rt)) {

				/* - Bridged-and-DNAT'ed traffic doesn't