lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV4]: struct ip_sf_list and struct ip_sf_socklist annotated

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro
2006-09-27 18:30:52 -07:00
committed by David S. Miller
parent 942bf921e9
commit ea4d9e7220
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/igmp.h
View File

@@ -136,7 +136,7 @@ struct ip_sf_socklist
{ {
unsigned int sl_max; unsigned int sl_max;
unsigned int sl_count; unsigned int sl_count;
__u32 sl_addr[0]; __be32 sl_addr[0];
}; };
#define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \ #define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \
@@ -159,7 +159,7 @@ struct ip_mc_socklist
struct ip_sf_list struct ip_sf_list
{ {
struct ip_sf_list *sf_next; struct ip_sf_list *sf_next;
__u32 sf_inaddr; __be32 sf_inaddr;
unsigned long sf_count[2]; /* include/exclude counts */ unsigned long sf_count[2]; /* include/exclude counts */
unsigned char sf_gsresp; /* include in g & s response? */ unsigned char sf_gsresp; /* include in g & s response? */
unsigned char sf_oldin; /* change state */ unsigned char sf_oldin; /* change state */

8
net/ipv4/igmp.c
View File

@@ -426,7 +426,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,
first = 1; first = 1;
psf_prev = NULL; psf_prev = NULL;
for (psf=*psf_list; psf; psf=psf_next) { for (psf=*psf_list; psf; psf=psf_next) {
u32 *psrc; __be32 *psrc;
psf_next = psf->sf_next; psf_next = psf->sf_next;
@@ -455,7 +455,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,
skb = add_grhead(skb, pmc, type, &pgr); skb = add_grhead(skb, pmc, type, &pgr);
first = 0; first = 0;
} }
psrc = (u32 *)skb_put(skb, sizeof(u32)); psrc = (__be32 *)skb_put(skb, sizeof(u32));
*psrc = psf->sf_inaddr; *psrc = psf->sf_inaddr;
scount++; stotal++; scount++; stotal++;
if ((type == IGMPV3_ALLOW_NEW_SOURCES || if ((type == IGMPV3_ALLOW_NEW_SOURCES ||
@@ -748,7 +748,7 @@ static void igmp_timer_expire(unsigned long data)
} }
/* mark EXCLUDE-mode sources */ /* mark EXCLUDE-mode sources */
static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs) static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs)
{ {
struct ip_sf_list *psf; struct ip_sf_list *psf;
int i, scount; int i, scount;
@@ -775,7 +775,7 @@ static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs)
return 1; return 1;
} }
static int igmp_marksources(struct ip_mc_list *pmc, int nsrcs, __u32 *srcs) static int igmp_marksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs)
{ {
struct ip_sf_list *psf; struct ip_sf_list *psf;
int i, scount; int i, scount;