korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: add mc_count to in_device.

Browse Source 
This patch add mc_count to struct in_device and updates
increment/decrement/initilaize of this field in IPv4 and in IPv6.

- Also printing the vfs /proc entry (/proc/net/igmp) is adjusted to
use the new mc_count.

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rami Rosen 2008-10-07 15:34:37 -07:00 committed by David S. Miller
parent be713a443e
commit b8bae41ed6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/inetdevice.h
View File

@ -25,6 +25,7 @@ struct in_device
struct in_ifaddr *ifa_list; /* IP ifaddr chain */ struct in_ifaddr *ifa_list; /* IP ifaddr chain */
rwlock_t mc_list_lock; rwlock_t mc_list_lock;
struct ip_mc_list *mc_list; /* IP multicast filter chain */ struct ip_mc_list *mc_list; /* IP multicast filter chain */
int mc_count; /* Number of installed mcasts */
spinlock_t mc_tomb_lock; spinlock_t mc_tomb_lock;
struct ip_mc_list *mc_tomb; struct ip_mc_list *mc_tomb;
unsigned long mr_v1_seen; unsigned long mr_v1_seen;

7
net/ipv4/igmp.c
View File

@ -1234,6 +1234,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
write_lock_bh(&in_dev->mc_list_lock); write_lock_bh(&in_dev->mc_list_lock);
im->next=in_dev->mc_list; im->next=in_dev->mc_list;
in_dev->mc_list=im; in_dev->mc_list=im;
in_dev->mc_count++;
write_unlock_bh(&in_dev->mc_list_lock); write_unlock_bh(&in_dev->mc_list_lock);
#ifdef CONFIG_IP_MULTICAST #ifdef CONFIG_IP_MULTICAST
igmpv3_del_delrec(in_dev, im->multiaddr); igmpv3_del_delrec(in_dev, im->multiaddr);
@ -1282,6 +1283,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)
if (--i->users == 0) { if (--i->users == 0) {
write_lock_bh(&in_dev->mc_list_lock); write_lock_bh(&in_dev->mc_list_lock);
*ip = i->next; *ip = i->next;
in_dev->mc_count--;
write_unlock_bh(&in_dev->mc_list_lock); write_unlock_bh(&in_dev->mc_list_lock);
igmp_group_dropped(i); igmp_group_dropped(i);
@ -1330,6 +1332,7 @@ void ip_mc_init_dev(struct in_device *in_dev)
setup_timer(&in_dev->mr_gq_timer, igmp_gq_timer_expire, setup_timer(&in_dev->mr_gq_timer, igmp_gq_timer_expire,
(unsigned long)in_dev); (unsigned long)in_dev);
in_dev->mr_ifc_count = 0; in_dev->mr_ifc_count = 0;
in_dev->mc_count = 0;
setup_timer(&in_dev->mr_ifc_timer, igmp_ifc_timer_expire, setup_timer(&in_dev->mr_ifc_timer, igmp_ifc_timer_expire,
(unsigned long)in_dev); (unsigned long)in_dev);
in_dev->mr_qrv = IGMP_Unsolicited_Report_Count; in_dev->mr_qrv = IGMP_Unsolicited_Report_Count;
@ -1369,8 +1372,8 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
write_lock_bh(&in_dev->mc_list_lock); write_lock_bh(&in_dev->mc_list_lock);
while ((i = in_dev->mc_list) != NULL) { while ((i = in_dev->mc_list) != NULL) {
in_dev->mc_list = i->next; in_dev->mc_list = i->next;
in_dev->mc_count--;
write_unlock_bh(&in_dev->mc_list_lock); write_unlock_bh(&in_dev->mc_list_lock);
igmp_group_dropped(i); igmp_group_dropped(i);
ip_ma_put(i); ip_ma_put(i);
@ -2383,7 +2386,7 @@ static int igmp_mc_seq_show(struct seq_file *seq, void *v)
if (state->in_dev->mc_list == im) { if (state->in_dev->mc_list == im) {
seq_printf(seq, "%d\t%-10s: %5d %7s\n", seq_printf(seq, "%d\t%-10s: %5d %7s\n",
state->dev->ifindex, state->dev->name, state->dev->mc_count, querier); state->dev->ifindex, state->dev->name, state->in_dev->mc_count, querier);
} }
seq_printf(seq, seq_printf(seq,