Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 352447
b: refs/heads/master
c: b0e9a30
h: refs/heads/master
i:
  352445: 7c27c90
  352443: 3743319
  352439: a8bb95e
  352431: 52e8178
  352415: 68015d8
  352383: 5291ac2
v: v3
  • Loading branch information
Vlad Yasevich authored and David S. Miller committed Feb 14, 2013
1 parent 264885b commit 89efcc5
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ba071ecb6d41ce172f9ccb3996f28cb337b3576
refs/heads/master: b0e9a30dd669a844bb4f74515f8bcd307018ffd0
69 changes: 49 additions & 20 deletions trunk/net/bridge/br_multicast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b)
{
if (a->proto != b->proto)
return 0;
if (a->vid != b->vid)
return 0;
switch (a->proto) {
case htons(ETH_P_IP):
return a->u.ip4 == b->u.ip4;
Expand All @@ -50,16 +52,19 @@ static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b)
return 0;
}

static inline int __br_ip4_hash(struct net_bridge_mdb_htable *mdb, __be32 ip)
static inline int __br_ip4_hash(struct net_bridge_mdb_htable *mdb, __be32 ip,
__u16 vid)
{
return jhash_1word(mdb->secret, (__force u32)ip) & (mdb->max - 1);
return jhash_2words((__force u32)ip, vid, mdb->secret) & (mdb->max - 1);
}

#if IS_ENABLED(CONFIG_IPV6)
static inline int __br_ip6_hash(struct net_bridge_mdb_htable *mdb,
const struct in6_addr *ip)
const struct in6_addr *ip,
__u16 vid)
{
return jhash2((__force u32 *)ip->s6_addr32, 4, mdb->secret) & (mdb->max - 1);
return jhash_2words(ipv6_addr_hash(ip), vid,
mdb->secret) & (mdb->max - 1);
}
#endif

Expand All @@ -68,10 +73,10 @@ static inline int br_ip_hash(struct net_bridge_mdb_htable *mdb,
{
switch (ip->proto) {
case htons(ETH_P_IP):
return __br_ip4_hash(mdb, ip->u.ip4);
return __br_ip4_hash(mdb, ip->u.ip4, ip->vid);
#if IS_ENABLED(CONFIG_IPV6)
case htons(ETH_P_IPV6):
return __br_ip6_hash(mdb, &ip->u.ip6);
return __br_ip6_hash(mdb, &ip->u.ip6, ip->vid);
#endif
}
return 0;
Expand Down Expand Up @@ -101,24 +106,27 @@ struct net_bridge_mdb_entry *br_mdb_ip_get(struct net_bridge_mdb_htable *mdb,
}

static struct net_bridge_mdb_entry *br_mdb_ip4_get(
struct net_bridge_mdb_htable *mdb, __be32 dst)
struct net_bridge_mdb_htable *mdb, __be32 dst, __u16 vid)
{
struct br_ip br_dst;

br_dst.u.ip4 = dst;
br_dst.proto = htons(ETH_P_IP);
br_dst.vid = vid;

return br_mdb_ip_get(mdb, &br_dst);
}

#if IS_ENABLED(CONFIG_IPV6)
static struct net_bridge_mdb_entry *br_mdb_ip6_get(
struct net_bridge_mdb_htable *mdb, const struct in6_addr *dst)
struct net_bridge_mdb_htable *mdb, const struct in6_addr *dst,
__u16 vid)
{
struct br_ip br_dst;

br_dst.u.ip6 = *dst;
br_dst.proto = htons(ETH_P_IPV6);
br_dst.vid = vid;

return br_mdb_ip_get(mdb, &br_dst);
}
Expand Down Expand Up @@ -694,7 +702,8 @@ static int br_multicast_add_group(struct net_bridge *br,

static int br_ip4_multicast_add_group(struct net_bridge *br,
struct net_bridge_port *port,
__be32 group)
__be32 group,
__u16 vid)
{
struct br_ip br_group;

Expand All @@ -703,14 +712,16 @@ static int br_ip4_multicast_add_group(struct net_bridge *br,

br_group.u.ip4 = group;
br_group.proto = htons(ETH_P_IP);
br_group.vid = vid;

return br_multicast_add_group(br, port, &br_group);
}

#if IS_ENABLED(CONFIG_IPV6)
static int br_ip6_multicast_add_group(struct net_bridge *br,
struct net_bridge_port *port,
const struct in6_addr *group)
const struct in6_addr *group,
__u16 vid)
{
struct br_ip br_group;

Expand All @@ -719,6 +730,7 @@ static int br_ip6_multicast_add_group(struct net_bridge *br,

br_group.u.ip6 = *group;
br_group.proto = htons(ETH_P_IPV6);
br_group.vid = vid;

return br_multicast_add_group(br, port, &br_group);
}
Expand Down Expand Up @@ -895,10 +907,12 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
int type;
int err = 0;
__be32 group;
u16 vid = 0;

if (!pskb_may_pull(skb, sizeof(*ih)))
return -EINVAL;

br_vlan_get_tag(skb, &vid);
ih = igmpv3_report_hdr(skb);
num = ntohs(ih->ngrec);
len = sizeof(*ih);
Expand Down Expand Up @@ -930,7 +944,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
continue;
}

err = br_ip4_multicast_add_group(br, port, group);
err = br_ip4_multicast_add_group(br, port, group, vid);
if (err)
break;
}
Expand All @@ -949,10 +963,12 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
int len;
int num;
int err = 0;
u16 vid = 0;

if (!pskb_may_pull(skb, sizeof(*icmp6h)))
return -EINVAL;

br_vlan_get_tag(skb, &vid);
icmp6h = icmp6_hdr(skb);
num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
len = sizeof(*icmp6h);
Expand Down Expand Up @@ -990,7 +1006,8 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
continue;
}

err = br_ip6_multicast_add_group(br, port, &grec->grec_mca);
err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
vid);
if (!err)
break;
}
Expand Down Expand Up @@ -1074,6 +1091,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
unsigned long now = jiffies;
__be32 group;
int err = 0;
u16 vid = 0;

spin_lock(&br->multicast_lock);
if (!netif_running(br->dev) ||
Expand Down Expand Up @@ -1108,7 +1126,8 @@ static int br_ip4_multicast_query(struct net_bridge *br,
if (!group)
goto out;

mp = br_mdb_ip4_get(mlock_dereference(br->mdb, br), group);
br_vlan_get_tag(skb, &vid);
mp = br_mdb_ip4_get(mlock_dereference(br->mdb, br), group, vid);
if (!mp)
goto out;

Expand Down Expand Up @@ -1149,6 +1168,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
unsigned long now = jiffies;
const struct in6_addr *group = NULL;
int err = 0;
u16 vid = 0;

spin_lock(&br->multicast_lock);
if (!netif_running(br->dev) ||
Expand Down Expand Up @@ -1180,7 +1200,8 @@ static int br_ip6_multicast_query(struct net_bridge *br,
if (!group)
goto out;

mp = br_mdb_ip6_get(mlock_dereference(br->mdb, br), group);
br_vlan_get_tag(skb, &vid);
mp = br_mdb_ip6_get(mlock_dereference(br->mdb, br), group, vid);
if (!mp)
goto out;

Expand Down Expand Up @@ -1286,7 +1307,8 @@ static void br_multicast_leave_group(struct net_bridge *br,

static void br_ip4_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port,
__be32 group)
__be32 group,
__u16 vid)
{
struct br_ip br_group;

Expand All @@ -1295,14 +1317,16 @@ static void br_ip4_multicast_leave_group(struct net_bridge *br,

br_group.u.ip4 = group;
br_group.proto = htons(ETH_P_IP);
br_group.vid = vid;

br_multicast_leave_group(br, port, &br_group);
}

#if IS_ENABLED(CONFIG_IPV6)
static void br_ip6_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port,
const struct in6_addr *group)
const struct in6_addr *group,
__u16 vid)
{
struct br_ip br_group;

Expand All @@ -1311,6 +1335,7 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br,

br_group.u.ip6 = *group;
br_group.proto = htons(ETH_P_IPV6);
br_group.vid = vid;

br_multicast_leave_group(br, port, &br_group);
}
Expand All @@ -1326,6 +1351,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
unsigned int len;
unsigned int offset;
int err;
u16 vid = 0;

/* We treat OOM as packet loss for now. */
if (!pskb_may_pull(skb, sizeof(*iph)))
Expand Down Expand Up @@ -1386,14 +1412,15 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,

err = 0;

br_vlan_get_tag(skb2, &vid);
BR_INPUT_SKB_CB(skb)->igmp = 1;
ih = igmp_hdr(skb2);

switch (ih->type) {
case IGMP_HOST_MEMBERSHIP_REPORT:
case IGMPV2_HOST_MEMBERSHIP_REPORT:
BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
err = br_ip4_multicast_add_group(br, port, ih->group);
err = br_ip4_multicast_add_group(br, port, ih->group, vid);
break;
case IGMPV3_HOST_MEMBERSHIP_REPORT:
err = br_ip4_multicast_igmp3_report(br, port, skb2);
Expand All @@ -1402,7 +1429,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
err = br_ip4_multicast_query(br, port, skb2);
break;
case IGMP_HOST_LEAVE_MESSAGE:
br_ip4_multicast_leave_group(br, port, ih->group);
br_ip4_multicast_leave_group(br, port, ih->group, vid);
break;
}

Expand All @@ -1427,6 +1454,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
unsigned int len;
int offset;
int err;
u16 vid = 0;

if (!pskb_may_pull(skb, sizeof(*ip6h)))
return -EINVAL;
Expand Down Expand Up @@ -1510,6 +1538,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,

err = 0;

br_vlan_get_tag(skb, &vid);
BR_INPUT_SKB_CB(skb)->igmp = 1;

switch (icmp6_type) {
Expand All @@ -1522,7 +1551,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
}
mld = (struct mld_msg *)skb_transport_header(skb2);
BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
err = br_ip6_multicast_add_group(br, port, &mld->mld_mca);
err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
break;
}
case ICMPV6_MLD2_REPORT:
Expand All @@ -1539,7 +1568,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
goto out;
}
mld = (struct mld_msg *)skb_transport_header(skb2);
br_ip6_multicast_leave_group(br, port, &mld->mld_mca);
br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
}
}

Expand Down
1 change: 1 addition & 0 deletions trunk/net/bridge/br_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct br_ip
#endif
} u;
__be16 proto;
__u16 vid;
};

struct net_port_vlans {
Expand Down

0 comments on commit 89efcc5

Please sign in to comment.