diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 21:30:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:02:00 -0400 |
commit | ea4d9e7220d32348cc9742ba6d27de5165262664 (patch) | |
tree | 4281211a94b6f7e68f96ebb5912086bbdfa8eac2 | |
parent | 942bf921e922560c05fde6afb00ddedf6224c608 (diff) |
[IPV4]: struct ip_sf_list and struct ip_sf_socklist annotated
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/igmp.h | 4 | ||||
-rw-r--r-- | net/ipv4/igmp.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index fd207d9b2733..4e9f3fe77cf9 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h | |||
@@ -136,7 +136,7 @@ struct ip_sf_socklist | |||
136 | { | 136 | { |
137 | unsigned int sl_max; | 137 | unsigned int sl_max; |
138 | unsigned int sl_count; | 138 | unsigned int sl_count; |
139 | __u32 sl_addr[0]; | 139 | __be32 sl_addr[0]; |
140 | }; | 140 | }; |
141 | 141 | ||
142 | #define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \ | 142 | #define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \ |
@@ -159,7 +159,7 @@ struct ip_mc_socklist | |||
159 | struct ip_sf_list | 159 | struct ip_sf_list |
160 | { | 160 | { |
161 | struct ip_sf_list *sf_next; | 161 | struct ip_sf_list *sf_next; |
162 | __u32 sf_inaddr; | 162 | __be32 sf_inaddr; |
163 | unsigned long sf_count[2]; /* include/exclude counts */ | 163 | unsigned long sf_count[2]; /* include/exclude counts */ |
164 | unsigned char sf_gsresp; /* include in g & s response? */ | 164 | unsigned char sf_gsresp; /* include in g & s response? */ |
165 | unsigned char sf_oldin; /* change state */ | 165 | unsigned char sf_oldin; /* change state */ |
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index a2e733a82de2..f6ca51a2dcc2 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -426,7 +426,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, | |||
426 | first = 1; | 426 | first = 1; |
427 | psf_prev = NULL; | 427 | psf_prev = NULL; |
428 | for (psf=*psf_list; psf; psf=psf_next) { | 428 | for (psf=*psf_list; psf; psf=psf_next) { |
429 | u32 *psrc; | 429 | __be32 *psrc; |
430 | 430 | ||
431 | psf_next = psf->sf_next; | 431 | psf_next = psf->sf_next; |
432 | 432 | ||
@@ -455,7 +455,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, | |||
455 | skb = add_grhead(skb, pmc, type, &pgr); | 455 | skb = add_grhead(skb, pmc, type, &pgr); |
456 | first = 0; | 456 | first = 0; |
457 | } | 457 | } |
458 | psrc = (u32 *)skb_put(skb, sizeof(u32)); | 458 | psrc = (__be32 *)skb_put(skb, sizeof(u32)); |
459 | *psrc = psf->sf_inaddr; | 459 | *psrc = psf->sf_inaddr; |
460 | scount++; stotal++; | 460 | scount++; stotal++; |
461 | if ((type == IGMPV3_ALLOW_NEW_SOURCES || | 461 | if ((type == IGMPV3_ALLOW_NEW_SOURCES || |
@@ -748,7 +748,7 @@ static void igmp_timer_expire(unsigned long data) | |||
748 | } | 748 | } |
749 | 749 | ||
750 | /* mark EXCLUDE-mode sources */ | 750 | /* mark EXCLUDE-mode sources */ |
751 | static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs) | 751 | static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs) |
752 | { | 752 | { |
753 | struct ip_sf_list *psf; | 753 | struct ip_sf_list *psf; |
754 | int i, scount; | 754 | int i, scount; |
@@ -775,7 +775,7 @@ static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs) | |||
775 | return 1; | 775 | return 1; |
776 | } | 776 | } |
777 | 777 | ||
778 | static int igmp_marksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs) | 778 | static int igmp_marksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs) |
779 | { | 779 | { |
780 | struct ip_sf_list *psf; | 780 | struct ip_sf_list *psf; |
781 | int i, scount; | 781 | int i, scount; |