diff options
| author |   Patrick McHardy <kaber@trash.net> | 2010-04-13 05:03:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-04-13 14:49:33 -0700 |
| commit | 862465f2e7e90975e7bf0ecfbb171dd3adedd950 (patch) | |
| tree | 281c43f90130cc23eb581c702afaf4ab226dbff5 /include | |
| parent | ipv4: ipmr: remove net pointer from struct mfc_cache (diff) | |
| download | linux-dev-862465f2e7e90975e7bf0ecfbb171dd3adedd950.tar.xz linux-dev-862465f2e7e90975e7bf0ecfbb171dd3adedd950.zip | |
ipv4: ipmr: convert struct mfc_cache to struct list_head
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mroute.h | 2 | ||||
| -rw-r--r-- | include/net/netns/ipv4.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index de7780a6dd32..7ff6c77d6008 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -191,7 +191,7 @@ struct vif_device { #define VIFF_STATIC 0x8000 struct mfc_cache { - struct mfc_cache *next; /* Next entry on cache line */ + struct list_head list; __be32 mfc_mcastgrp; /* Group the entry belongs to */ __be32 mfc_origin; /* Source of packet */ vifi_t mfc_parent; /* Source interface */ diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index b15e518f952a..5d06429968d5 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -61,8 +61,8 @@ struct netns_ipv4 { #ifdef CONFIG_IP_MROUTE struct sock *mroute_sk; struct timer_list ipmr_expire_timer; - struct mfc_cache *mfc_unres_queue; - struct mfc_cache **mfc_cache_array; + struct list_head mfc_unres_queue; + struct list_head *mfc_cache_array; struct vif_device *vif_table; int maxvif; atomic_t cache_resolve_queue_len; |