diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 21:30:07 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:01:58 -0400 |
commit | 8f935bbd7c6c66796c2403aefdab74bb48045bf6 (patch) | |
tree | 500b6cb37a536cdf4b63b6d33c53bdc6c752b228 /net/ipv4/igmp.c | |
parent | 00a5020cd51febbb3166ff7a09a2901c47ba251a (diff) |
[IPV4]: ip_mc_{inc,dec}_group() annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index d8068c483781..a2e733a82de2 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -144,8 +144,8 @@ static int sf_setstate(struct ip_mc_list *pmc); | |||
144 | static void sf_markstate(struct ip_mc_list *pmc); | 144 | static void sf_markstate(struct ip_mc_list *pmc); |
145 | #endif | 145 | #endif |
146 | static void ip_mc_clear_src(struct ip_mc_list *pmc); | 146 | static void ip_mc_clear_src(struct ip_mc_list *pmc); |
147 | static int ip_mc_add_src(struct in_device *in_dev, __u32 *pmca, int sfmode, | 147 | static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, |
148 | int sfcount, __u32 *psfsrc, int delta); | 148 | int sfcount, __be32 *psfsrc, int delta); |
149 | 149 | ||
150 | static void ip_ma_put(struct ip_mc_list *im) | 150 | static void ip_ma_put(struct ip_mc_list *im) |
151 | { | 151 | { |
@@ -1193,7 +1193,7 @@ static void igmp_group_added(struct ip_mc_list *im) | |||
1193 | * A socket has joined a multicast group on device dev. | 1193 | * A socket has joined a multicast group on device dev. |
1194 | */ | 1194 | */ |
1195 | 1195 | ||
1196 | void ip_mc_inc_group(struct in_device *in_dev, u32 addr) | 1196 | void ip_mc_inc_group(struct in_device *in_dev, __be32 addr) |
1197 | { | 1197 | { |
1198 | struct ip_mc_list *im; | 1198 | struct ip_mc_list *im; |
1199 | 1199 | ||
@@ -1252,7 +1252,7 @@ out: | |||
1252 | * A socket has left a multicast group on device dev | 1252 | * A socket has left a multicast group on device dev |
1253 | */ | 1253 | */ |
1254 | 1254 | ||
1255 | void ip_mc_dec_group(struct in_device *in_dev, u32 addr) | 1255 | void ip_mc_dec_group(struct in_device *in_dev, __be32 addr) |
1256 | { | 1256 | { |
1257 | struct ip_mc_list *i, **ip; | 1257 | struct ip_mc_list *i, **ip; |
1258 | 1258 | ||
@@ -1402,7 +1402,7 @@ int sysctl_igmp_max_msf __read_mostly = IP_MAX_MSF; | |||
1402 | 1402 | ||
1403 | 1403 | ||
1404 | static int ip_mc_del1_src(struct ip_mc_list *pmc, int sfmode, | 1404 | static int ip_mc_del1_src(struct ip_mc_list *pmc, int sfmode, |
1405 | __u32 *psfsrc) | 1405 | __be32 *psfsrc) |
1406 | { | 1406 | { |
1407 | struct ip_sf_list *psf, *psf_prev; | 1407 | struct ip_sf_list *psf, *psf_prev; |
1408 | int rv = 0; | 1408 | int rv = 0; |
@@ -1450,8 +1450,8 @@ static int ip_mc_del1_src(struct ip_mc_list *pmc, int sfmode, | |||
1450 | #define igmp_ifc_event(x) do { } while (0) | 1450 | #define igmp_ifc_event(x) do { } while (0) |
1451 | #endif | 1451 | #endif |
1452 | 1452 | ||
1453 | static int ip_mc_del_src(struct in_device *in_dev, __u32 *pmca, int sfmode, | 1453 | static int ip_mc_del_src(struct in_device *in_dev, __be32 *pmca, int sfmode, |
1454 | int sfcount, __u32 *psfsrc, int delta) | 1454 | int sfcount, __be32 *psfsrc, int delta) |
1455 | { | 1455 | { |
1456 | struct ip_mc_list *pmc; | 1456 | struct ip_mc_list *pmc; |
1457 | int changerec = 0; | 1457 | int changerec = 0; |
@@ -1517,7 +1517,7 @@ out_unlock: | |||
1517 | * Add multicast single-source filter to the interface list | 1517 | * Add multicast single-source filter to the interface list |
1518 | */ | 1518 | */ |
1519 | static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode, | 1519 | static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode, |
1520 | __u32 *psfsrc, int delta) | 1520 | __be32 *psfsrc, int delta) |
1521 | { | 1521 | { |
1522 | struct ip_sf_list *psf, *psf_prev; | 1522 | struct ip_sf_list *psf, *psf_prev; |
1523 | 1523 | ||
@@ -1623,8 +1623,8 @@ static int sf_setstate(struct ip_mc_list *pmc) | |||
1623 | /* | 1623 | /* |
1624 | * Add multicast source filter list to the interface list | 1624 | * Add multicast source filter list to the interface list |
1625 | */ | 1625 | */ |
1626 | static int ip_mc_add_src(struct in_device *in_dev, __u32 *pmca, int sfmode, | 1626 | static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, |
1627 | int sfcount, __u32 *psfsrc, int delta) | 1627 | int sfcount, __be32 *psfsrc, int delta) |
1628 | { | 1628 | { |
1629 | struct ip_mc_list *pmc; | 1629 | struct ip_mc_list *pmc; |
1630 | int isexclude; | 1630 | int isexclude; |
@@ -1717,7 +1717,7 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc) | |||
1717 | int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr) | 1717 | int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr) |
1718 | { | 1718 | { |
1719 | int err; | 1719 | int err; |
1720 | u32 addr = imr->imr_multiaddr.s_addr; | 1720 | __be32 addr = imr->imr_multiaddr.s_addr; |
1721 | struct ip_mc_socklist *iml=NULL, *i; | 1721 | struct ip_mc_socklist *iml=NULL, *i; |
1722 | struct in_device *in_dev; | 1722 | struct in_device *in_dev; |
1723 | struct inet_sock *inet = inet_sk(sk); | 1723 | struct inet_sock *inet = inet_sk(sk); |
@@ -1791,7 +1791,7 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr) | |||
1791 | struct inet_sock *inet = inet_sk(sk); | 1791 | struct inet_sock *inet = inet_sk(sk); |
1792 | struct ip_mc_socklist *iml, **imlp; | 1792 | struct ip_mc_socklist *iml, **imlp; |
1793 | struct in_device *in_dev; | 1793 | struct in_device *in_dev; |
1794 | u32 group = imr->imr_multiaddr.s_addr; | 1794 | __be32 group = imr->imr_multiaddr.s_addr; |
1795 | u32 ifindex; | 1795 | u32 ifindex; |
1796 | int ret = -EADDRNOTAVAIL; | 1796 | int ret = -EADDRNOTAVAIL; |
1797 | 1797 | ||