Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7d6a432 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of... 

Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
parents 4b340ae2 08b202b6

include/net/mld.h

0 → 100644
+75 −0
Original line number Original line Diff line number Diff line 
#ifndef LINUX_MLD_H

#define LINUX_MLD_H



#include <linux/in6.h>

#include <linux/icmpv6.h>



/* MLDv1 Query/Report/Done */

struct mld_msg {

	struct icmp6hdr		mld_hdr;

	struct in6_addr		mld_mca;

};



#define mld_type		mld_hdr.icmp6_type

#define mld_code		mld_hdr.icmp6_code

#define mld_cksum		mld_hdr.icmp6_cksum

#define mld_maxdelay		mld_hdr.icmp6_maxdelay

#define mld_reserved		mld_hdr.icmp6_dataun.un_data16[1]



/* Multicast Listener Discovery version 2 headers */

/* MLDv2 Report */

struct mld2_grec {

	__u8		grec_type;

	__u8		grec_auxwords;

	__be16		grec_nsrcs;

	struct in6_addr	grec_mca;

	struct in6_addr	grec_src[0];

};



struct mld2_report {

	struct icmp6hdr		mld2r_hdr;

	struct mld2_grec	mld2r_grec[0];

};



#define mld2r_type		mld2r_hdr.icmp6_type

#define mld2r_resv1		mld2r_hdr.icmp6_code

#define mld2r_cksum		mld2r_hdr.icmp6_cksum

#define mld2r_resv2		mld2r_hdr.icmp6_dataun.un_data16[0]

#define mld2r_ngrec		mld2r_hdr.icmp6_dataun.un_data16[1]



/* MLDv2 Query */

struct mld2_query {

	struct icmp6hdr		mld2q_hdr;

	struct in6_addr		mld2q_mca;

#if defined(__LITTLE_ENDIAN_BITFIELD)

	__u8			mld2q_qrv:3,

				mld2q_suppress:1,

				mld2q_resv2:4;

#elif defined(__BIG_ENDIAN_BITFIELD)

	__u8			mld2q_resv2:4,

				mld2q_suppress:1,

				mld2q_qrv:3;

#else

#error "Please fix <asm/byteorder.h>"

#endif

	__u8			mld2q_qqic;

	__be16			mld2q_nsrcs;

	struct in6_addr		mld2q_srcs[0];

};



#define mld2q_type		mld2q_hdr.icmp6_type

#define mld2q_code		mld2q_hdr.icmp6_code

#define mld2q_cksum		mld2q_hdr.icmp6_cksum

#define mld2q_mrc		mld2q_hdr.icmp6_maxdelay

#define mld2q_resv1		mld2q_hdr.icmp6_dataun.un_data16[1]



/* Max Response Code */

#define MLDV2_MASK(value, nb) ((nb)>=32 ? (value) : ((1<<(nb))-1) & (value))

#define MLDV2_EXP(thresh, nbmant, nbexp, value) \

	((value) < (thresh) ? (value) : \

	((MLDV2_MASK(value, nbmant) | (1<<(nbmant))) << \

	(MLDV2_MASK((value) >> (nbmant), nbexp) + (nbexp))))



#define MLDV2_MRC(value) MLDV2_EXP(0x8000, 12, 3, value)



#endif

net/bridge/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,14 +33,14 @@ config BRIDGE 
	  If unsure, say N.

	  If unsure, say N.





config BRIDGE_IGMP_SNOOPING

config BRIDGE_IGMP_SNOOPING

	bool "IGMP snooping"

	bool "IGMP/MLD snooping"

	depends on BRIDGE

	depends on BRIDGE

	depends on INET

	depends on INET

	default y

	default y

	---help---

	---help---

	  If you say Y here, then the Ethernet bridge will be able selectively

	  If you say Y here, then the Ethernet bridge will be able selectively

	  forward multicast traffic based on IGMP traffic received from each

	  forward multicast traffic based on IGMP/MLD traffic received from

	  port.

	  each port.





	  Say N to exclude this support and reduce the binary size.

	  Say N to exclude this support and reduce the binary size.

net/bridge/br_multicast.c

+563 −56

File changed.

Preview size limit exceeded, changes collapsed.

net/bridge/br_private.h

+13 −2
Original line number Original line Diff line number Diff line
@@ -45,6 +45,17 @@ struct mac_addr 
	unsigned char	addr[6];

	unsigned char	addr[6];

};

};





struct br_ip

{

	union {

		__be32	ip4;

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

		struct in6_addr ip6;

#endif

	} u;

	__be16		proto;

};



struct net_bridge_fdb_entry

struct net_bridge_fdb_entry

{

{

	struct hlist_node		hlist;

	struct hlist_node		hlist;
@@ -64,7 +75,7 @@ struct net_bridge_port_group { 
	struct rcu_head			rcu;

	struct rcu_head			rcu;

	struct timer_list		timer;

	struct timer_list		timer;

	struct timer_list		query_timer;

	struct timer_list		query_timer;

	__be32				addr;

	struct br_ip			addr;

	u32				queries_sent;

	u32				queries_sent;

};

};
@@ -77,7 +88,7 @@ struct net_bridge_mdb_entry 
	struct rcu_head			rcu;

	struct rcu_head			rcu;

	struct timer_list		timer;

	struct timer_list		timer;

	struct timer_list		query_timer;

	struct timer_list		query_timer;

	__be32				addr;

	struct br_ip			addr;

	u32				queries_sent;

	u32				queries_sent;

};

};

net/ipv6/mcast.c

+40 −95

File changed.

Preview size limit exceeded, changes collapsed.