linux.git/net/ipv4/ipmr.c, branch v2.6.37

ipmr: cleanups

2010-10-04T04:50:53+00:00

Various code style cleanups

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

ipmr: RCU protection for mfc_cache_array

2010-10-04T04:50:53+00:00

Use RCU & RTNL protection for mfc_cache_array[]

ipmr_cache_find() is called under rcu_read_lock();

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

ipmr: RCU conversion of mroute_sk

2010-10-04T04:50:52+00:00

Use RCU and RTNL to protect (struct mr_table)->mroute_sk

Readers use RCU, writers use RTNL.

ip_ra_control() already use an RCU grace period before
ip_ra_destroy_rcu(), so we dont need synchronize_rcu() in
mrtsock_destruct()

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

ipmr: __pim_rcv() is called under rcu_read_lock

2010-10-04T04:50:52+00:00

No need to get a reference on reg_dev and release it, we are in a
rcu_read_lock() protected section.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

ipv4: ip_ptr cleanups

2010-09-16T05:06:05+00:00

dev->ip_ptr is protected by rtnl and rcu.

Yet some places dont use appropriate primitives and/or locking rules.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

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

2010-07-21T01:25:24+00:00

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller

ipmr: Don't leak memory if fib lookup fails.

2010-07-16T05:38:43+00:00

This was detected using two mcast router tables.  The
pimreg for the second interface did not have a specific
mrule, so packets received by it were handled by the
default table, which had nothing configured.

This caused the ipmr_fib_lookup to fail, causing
the memory leak.

Signed-off-by: Ben Greear 
Signed-off-by: David S. Miller

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

2010-06-11T20:32:31+00:00

net-next: remove useless union keyword

2010-06-11T06:31:35+00:00

remove useless union keyword in rtable, rt6_info and dn_route.

Since there is only one member in a union, the union keyword isn't useful.

Signed-off-by: Changli Gao 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

ipmr: dont corrupt lists

2010-06-07T09:57:14+00:00

ipmr_rules_exit() and ip6mr_rules_exit() free a list of items, but
forget to properly remove these items from list. List head is not
changed and still points to freed memory.

This can trigger a fault later when icmpv6_sk_exit() is called.

Fix is to either reinit list, or use list_del() to properly remove items
from list before freeing them.

bugzilla report : https://bugzilla.kernel.org/show_bug.cgi?id=16120

Introduced by commit d1db275dd3f6e4 (ipv6: ip6mr: support multiple
tables) and commit f0ad0860d01e (ipv4: ipmr: support multiple tables)

Reported-by: Alex Zhavnerchik 
Signed-off-by: Eric Dumazet 
CC: Patrick McHardy 
Signed-off-by: David S. Miller