diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/igmp.h | 8 | ||||
| -rw-r--r-- | include/linux/net.h | 3 | ||||
| -rw-r--r-- | include/net/ip6_route.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 2cc2472d2eb2..8144cabdad06 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -191,7 +191,7 @@ struct ip_mc_list (IGMPV3_MASK((value) >> (nbmant), nbexp) + (nbexp)))) #define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value) -#define IGMPV3_MRC(value) IGMPV3_EXP(0x8000, 12, 3, value) +#define IGMPV3_MRC(value) IGMPV3_EXP(0x80, 4, 3, value) extern int ip_check_mc(struct in_device *dev, u32 mc_addr, u32 src_addr, u16 proto); extern int igmp_rcv(struct sk_buff *); @@ -199,10 +199,12 @@ extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr); extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr); extern void ip_mc_drop_socket(struct sock *sk); extern int ip_mc_source(int add, int omode, struct sock *sk, - struct ip_mreq_source *mreqs); -extern int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf); + struct ip_mreq_source *mreqs, int ifindex); +extern int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf,int ifindex); extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, struct ip_msfilter *optval, int *optlen); +extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, + struct group_filter *optval, int *optlen); extern int ip_mc_sf_allow(struct sock *sk, u32 local, u32 rmt, int dif); extern void ip_mr_init(void); extern void ip_mc_init_dev(struct in_device *); diff --git a/include/linux/net.h b/include/linux/net.h index fc6b655dcdc3..8b012430f49d 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -140,6 +140,9 @@ struct net_proto_family { struct module *owner; }; +extern int net_family_get(int family); +extern void net_family_put(int family); + struct iovec; extern int sock_wake_async(struct socket *sk, int how, int band); diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 1a5c99c5afa2..1af054ea6385 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -59,7 +59,7 @@ extern struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr, int oif, int flags); -extern struct rt6_info *ndisc_get_dummy_rt(void); +extern struct rt6_info *ip6_dst_alloc(void); /* * support functions for ND |