aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mroute.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mroute.h')
-rw-r--r--include/linux/mroute.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index d5f69151f692..c5f3d53548e2 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -76,8 +76,7 @@ struct vifctl {
76 * Cache manipulation structures for mrouted and PIMd 76 * Cache manipulation structures for mrouted and PIMd
77 */ 77 */
78 78
79struct mfcctl 79struct mfcctl {
80{
81 struct in_addr mfcc_origin; /* Origin of mcast */ 80 struct in_addr mfcc_origin; /* Origin of mcast */
82 struct in_addr mfcc_mcastgrp; /* Group in question */ 81 struct in_addr mfcc_mcastgrp; /* Group in question */
83 vifi_t mfcc_parent; /* Where it arrived */ 82 vifi_t mfcc_parent; /* Where it arrived */
@@ -92,8 +91,7 @@ struct mfcctl
92 * Group count retrieval for mrouted 91 * Group count retrieval for mrouted
93 */ 92 */
94 93
95struct sioc_sg_req 94struct sioc_sg_req {
96{
97 struct in_addr src; 95 struct in_addr src;
98 struct in_addr grp; 96 struct in_addr grp;
99 unsigned long pktcnt; 97 unsigned long pktcnt;
@@ -105,8 +103,7 @@ struct sioc_sg_req
105 * To get vif packet counts 103 * To get vif packet counts
106 */ 104 */
107 105
108struct sioc_vif_req 106struct sioc_vif_req {
109{
110 vifi_t vifi; /* Which iface */ 107 vifi_t vifi; /* Which iface */
111 unsigned long icount; /* In packets */ 108 unsigned long icount; /* In packets */
112 unsigned long ocount; /* Out packets */ 109 unsigned long ocount; /* Out packets */
@@ -119,8 +116,7 @@ struct sioc_vif_req
119 * data. Magically happens to be like an IP packet as per the original 116 * data. Magically happens to be like an IP packet as per the original
120 */ 117 */
121 118
122struct igmpmsg 119struct igmpmsg {
123{
124 __u32 unused1,unused2; 120 __u32 unused1,unused2;
125 unsigned char im_msgtype; /* What is this */ 121 unsigned char im_msgtype; /* What is this */
126 unsigned char im_mbz; /* Must be zero */ 122 unsigned char im_mbz; /* Must be zero */
@@ -181,8 +177,7 @@ static inline int ip_mr_init(void)
181} 177}
182#endif 178#endif
183 179
184struct vif_device 180struct vif_device {
185{
186 struct net_device *dev; /* Device we are using */ 181 struct net_device *dev; /* Device we are using */
187 unsigned long bytes_in,bytes_out; 182 unsigned long bytes_in,bytes_out;
188 unsigned long pkt_in,pkt_out; /* Statistics */ 183 unsigned long pkt_in,pkt_out; /* Statistics */
@@ -195,8 +190,7 @@ struct vif_device
195 190
196#define VIFF_STATIC 0x8000 191#define VIFF_STATIC 0x8000
197 192
198struct mfc_cache 193struct mfc_cache {
199{
200 struct mfc_cache *next; /* Next entry on cache line */ 194 struct mfc_cache *next; /* Next entry on cache line */
201#ifdef CONFIG_NET_NS 195#ifdef CONFIG_NET_NS
202 struct net *mfc_net; 196 struct net *mfc_net;