From ce3935f5c159f4a50ae65f4d6c0561885f605664 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 27 Sep 2006 18:31:10 -0700 Subject: [PATCH] --- yaml --- r: 36840 b: refs/heads/master c: c0cda068aac3481d40795b115e4fd36f7d386e3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/igmp.h | 2 +- trunk/net/ipv4/igmp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 629bd39d264c..3edc519d719d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea4d9e7220d32348cc9742ba6d27de5165262664 +refs/heads/master: c0cda068aac3481d40795b115e4fd36f7d386e3a diff --git a/trunk/include/linux/igmp.h b/trunk/include/linux/igmp.h index 4e9f3fe77cf9..7514cceb4fe3 100644 --- a/trunk/include/linux/igmp.h +++ b/trunk/include/linux/igmp.h @@ -209,7 +209,7 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, struct ip_msfilter __user *optval, int __user *optlen); extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, struct group_filter __user *optval, int __user *optlen); -extern int ip_mc_sf_allow(struct sock *sk, u32 local, u32 rmt, int dif); +extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif); extern void ip_mr_init(void); extern void ip_mc_init_dev(struct in_device *); extern void ip_mc_destroy_dev(struct in_device *); diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c index f6ca51a2dcc2..a2c7b2b1b3fb 100644 --- a/trunk/net/ipv4/igmp.c +++ b/trunk/net/ipv4/igmp.c @@ -2156,7 +2156,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, /* * check if a multicast source filter allows delivery for a given */ -int ip_mc_sf_allow(struct sock *sk, u32 loc_addr, u32 rmt_addr, int dif) +int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif) { struct inet_sock *inet = inet_sk(sk); struct ip_mc_socklist *pmc;