lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6

Browse Source
This commit is contained in:
David S. Miller
2010-04-15 14:14:05 -07:00
parent fd793d8905 8de53dfbf9
commit 791f58c064
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/Kconfig
View File

@@ -252,7 +252,7 @@ config IP_MROUTE
config IP_MROUTE_MULTIPLE_TABLES config IP_MROUTE_MULTIPLE_TABLES
bool "IP: multicast policy routing" bool "IP: multicast policy routing"
depends on IP_ADVANCED_ROUTER depends on IP_MROUTE && IP_ADVANCED_ROUTER
select FIB_RULES select FIB_RULES
help help
Normally, a multicast router runs a userspace daemon and decides Normally, a multicast router runs a userspace daemon and decides

10
net/ipv4/ipmr.c
View File

@@ -71,6 +71,9 @@
struct mr_table { struct mr_table {
struct list_head list; struct list_head list;
#ifdef CONFIG_NET_NS
struct net *net;
#endif
u32 id; u32 id;
struct sock *mroute_sk; struct sock *mroute_sk;
struct timer_list ipmr_expire_timer; struct timer_list ipmr_expire_timer;
@@ -308,6 +311,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
mrt = kzalloc(sizeof(*mrt), GFP_KERNEL); mrt = kzalloc(sizeof(*mrt), GFP_KERNEL);
if (mrt == NULL) if (mrt == NULL)
return NULL; return NULL;
write_pnet(&mrt->net, net);
mrt->id = id; mrt->id = id;
/* Forwarding cache */ /* Forwarding cache */
@@ -580,7 +584,7 @@ static inline void ipmr_cache_free(struct mfc_cache *c)
static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c) static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c)
{ {
struct net *net = NULL; //mrt->net; struct net *net = read_pnet(&mrt->net);
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsgerr *e; struct nlmsgerr *e;
@@ -1089,12 +1093,14 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
* Check to see if we resolved a queued list. If so we * Check to see if we resolved a queued list. If so we
* need to send on the frames and tidy up. * need to send on the frames and tidy up.
*/ */
found = false;
spin_lock_bh(&mfc_unres_lock); spin_lock_bh(&mfc_unres_lock);
list_for_each_entry(uc, &mrt->mfc_unres_queue, list) { list_for_each_entry(uc, &mrt->mfc_unres_queue, list) {
if (uc->mfc_origin == c->mfc_origin && if (uc->mfc_origin == c->mfc_origin &&
uc->mfc_mcastgrp == c->mfc_mcastgrp) { uc->mfc_mcastgrp == c->mfc_mcastgrp) {
list_del(&uc->list); list_del(&uc->list);
atomic_dec(&mrt->cache_resolve_queue_len); atomic_dec(&mrt->cache_resolve_queue_len);
found = true;
break; break;
} }
} }
@@ -1102,7 +1108,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
del_timer(&mrt->ipmr_expire_timer); del_timer(&mrt->ipmr_expire_timer);
spin_unlock_bh(&mfc_unres_lock); spin_unlock_bh(&mfc_unres_lock);
if (uc) { if (found) {
ipmr_cache_resolve(net, mrt, uc, c); ipmr_cache_resolve(net, mrt, uc, c);
ipmr_cache_free(uc); ipmr_cache_free(uc);
} }