From ddf3dc1261cdea8b13730f6f28db6df8907c2e74 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 6 Jun 2010 15:34:40 -0700 Subject: [PATCH] --- yaml --- r: 200262 b: refs/heads/master c: 8ffb335e8d696affc04f963bf73ce2196f80edb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6mr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 652a74f97018..fca4c6a5ba24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72e09ad107e78d69ff4d3b97a69f0aad2b77280f +refs/heads/master: 8ffb335e8d696affc04f963bf73ce2196f80edb9 diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c index 073071f2b75b..89c0b077c7aa 100644 --- a/trunk/net/ipv6/ip6mr.c +++ b/trunk/net/ipv6/ip6mr.c @@ -120,7 +120,7 @@ static void mroute_clean_tables(struct mr6_table *mrt); static void ipmr_expire_process(unsigned long arg); #ifdef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES -#define ip6mr_for_each_table(mrt, met) \ +#define ip6mr_for_each_table(mrt, net) \ list_for_each_entry_rcu(mrt, &net->ipv6.mr6_tables, list) static struct mr6_table *ip6mr_get_table(struct net *net, u32 id)