Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 27 Dec 2010 06:37:05 +0000 (22:37 -0800)]
Conflicts:
net/ipv4/fib_frontend.c

12 files changed:
1  2 
MAINTAINERS
drivers/infiniband/hw/mlx4/main.c
drivers/net/Kconfig
drivers/net/atl1c/atl1c_main.c
drivers/net/sundance.c
include/net/flow.h
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/ipv4/tcp_ipv4.c
net/mac80211/Kconfig
net/mac80211/rx.c
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge