From 0245fafceda3d63d0db66587d8c07b84907a31e5 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 7 Feb 2008 17:58:20 -0800 Subject: [PATCH] --- yaml --- r: 84847 b: refs/heads/master c: 4136cd523eb0c0bd53173e16fd7406d31d05824f h: refs/heads/master i: 84845: 9fb28d0f69fdb76146b786696c404d1cf3289574 84843: 0f54cd0df9bf410dcd5b7a99e96f40963291381b 84839: 0a30bde586e72d9f1e79e3c023ef874e563837d1 84831: 64c7683057933e395fcf2f9bfe87b8ea3fb0670b v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 061fb4c6a104..517c5af1b97d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5da621f1c514b8a39c6f7112becb97262ae76900 +refs/heads/master: 4136cd523eb0c0bd53173e16fd7406d31d05824f diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 8842ecb9be48..525787b52b72 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -2041,7 +2041,7 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr, int iif = dev->ifindex; struct net *net; - net = skb->dev->nd_net; + net = dev->nd_net; tos &= IPTOS_RT_MASK; hash = rt_hash(daddr, saddr, iif);