From e4e7ad2b09cbdf5c9887f8f5f908353566414d5a Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Thu, 25 Oct 2007 18:54:46 -0700
Subject: [PATCH] --- yaml --- r: 72595 b: refs/heads/master c:
 fee9dee730a40f671c1972a324ed54f0d68523e1 h: refs/heads/master i:   72593:
 a3c95a55e2d01359239e470e1330d92af2ef2867   72591:
 3326aec0e7965ecada4811b91c09ee46244c972d v: v3

---
 [refs]                              | 2 +-
 trunk/include/net/inet_hashtables.h | 6 ------
 trunk/include/net/inet_sock.h       | 7 +++++++
 trunk/net/ipv4/udp.c                | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dff3ae5cf540..71ec1e7d3331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41fb285430e9cb57da624d838afef7b2fc67e276
+refs/heads/master: fee9dee730a40f671c1972a324ed54f0d68523e1
diff --git a/trunk/include/net/inet_hashtables.h b/trunk/include/net/inet_hashtables.h
index 8228b57eb18f..4427dcd1e53a 100644
--- a/trunk/include/net/inet_hashtables.h
+++ b/trunk/include/net/inet_hashtables.h
@@ -26,7 +26,6 @@
 
 #include <net/inet_connection_sock.h>
 #include <net/inet_sock.h>
-#include <net/route.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 
@@ -266,11 +265,6 @@ static inline void inet_unhash(struct inet_hashinfo *hashinfo, struct sock *sk)
 		wake_up(&hashinfo->lhash_wait);
 }
 
-static inline int inet_iif(const struct sk_buff *skb)
-{
-	return ((struct rtable *)skb->dst)->rt_iif;
-}
-
 extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
 					   const __be32 daddr,
 					   const unsigned short hnum,
diff --git a/trunk/include/net/inet_sock.h b/trunk/include/net/inet_sock.h
index 62daf214931f..70013c5f4e59 100644
--- a/trunk/include/net/inet_sock.h
+++ b/trunk/include/net/inet_sock.h
@@ -24,6 +24,7 @@
 #include <net/flow.h>
 #include <net/sock.h>
 #include <net/request_sock.h>
+#include <net/route.h>
 
 /** struct ip_options - IP Options
  *
@@ -190,4 +191,10 @@ static inline int inet_sk_ehashfn(const struct sock *sk)
 	return inet_ehashfn(laddr, lport, faddr, fport);
 }
 
+
+static inline int inet_iif(const struct sk_buff *skb)
+{
+	return ((struct rtable *)skb->dst)->rt_iif;
+}
+
 #endif	/* _INET_SOCK_H */
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index 35d2b0e9e10b..4bc25b46f33f 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -1152,7 +1152,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 		return __udp4_lib_mcast_deliver(skb, uh, saddr, daddr, udptable);
 
 	sk = __udp4_lib_lookup(saddr, uh->source, daddr, uh->dest,
-			       skb->dev->ifindex, udptable        );
+			       inet_iif(skb), udptable);
 
 	if (sk != NULL) {
 		int ret = udp_queue_rcv_skb(sk, skb);