From: David S. Miller <davem@davemloft.net>
Date: Mon, 27 Dec 2010 06:37:05 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: MMI-PSA29.97-13-9~21446^2~83
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=17f7f4d9fcce8f1b75b5f735569309dee7665968;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	net/ipv4/fib_frontend.c
---

17f7f4d9fcce8f1b75b5f735569309dee7665968
diff --cc net/ipv4/fib_frontend.c
index 9f8bb68911e4,c19c1f739fba..1d2cdd43a878
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@@ -158,8 -158,11 +158,7 @@@ static void fib_flush(struct net *net
  struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref)
  {
  	struct flowi fl = {
 -		.nl_u = {
 -			.ip4_u = {
 -				.daddr = addr
 -			}
 -		},
 +		.fl4_dst = addr,
- 		.flags = FLOWI_FLAG_MATCH_ANY_IIF
  	};
  	struct fib_result res = { 0 };
  	struct net_device *dev = NULL;