* [Patch net] bridge: add missing vid to br_mdb_get()
@ 2013-03-07 13:05 Cong Wang
2013-03-07 15:18 ` Vlad Yasevich
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2013-03-07 13:05 UTC (permalink / raw)
To: netdev; +Cc: Vlad Yasevich, Stephen Hemminger, David S. Miller, Cong Wang
From: Cong Wang <amwang@redhat.com>
Obviously, vid should be considered when searching for multicast
group.
Cc: Vlad Yasevich <vyasevic@redhat.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index d5f1d3f..314c73e 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -66,7 +66,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
goto out;
}
- mdst = br_mdb_get(br, skb);
+ mdst = br_mdb_get(br, skb, vid);
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
br_multicast_deliver(mdst, skb);
else
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 4803301..828e2bc 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -97,7 +97,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
if (is_broadcast_ether_addr(dest))
skb2 = skb;
else if (is_multicast_ether_addr(dest)) {
- mdst = br_mdb_get(br, skb);
+ mdst = br_mdb_get(br, skb, vid);
if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
if ((mdst && mdst->mglist) ||
br_multicast_is_router(br))
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 10e6fce..923fbea 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -132,7 +132,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(
#endif
struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
- struct sk_buff *skb)
+ struct sk_buff *skb, u16 vid)
{
struct net_bridge_mdb_htable *mdb = rcu_dereference(br->mdb);
struct br_ip ip;
@@ -144,6 +144,7 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
return NULL;
ip.proto = skb->protocol;
+ ip.vid = vid;
switch (skb->protocol) {
case htons(ETH_P_IP):
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 6d314c4..3cbf5be 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -442,7 +442,7 @@ extern int br_multicast_rcv(struct net_bridge *br,
struct net_bridge_port *port,
struct sk_buff *skb);
extern struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
- struct sk_buff *skb);
+ struct sk_buff *skb, u16 vid);
extern void br_multicast_add_port(struct net_bridge_port *port);
extern void br_multicast_del_port(struct net_bridge_port *port);
extern void br_multicast_enable_port(struct net_bridge_port *port);
@@ -504,7 +504,7 @@ static inline int br_multicast_rcv(struct net_bridge *br,
}
static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
- struct sk_buff *skb)
+ struct sk_buff *skb, u16 vid)
{
return NULL;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Patch net] bridge: add missing vid to br_mdb_get()
2013-03-07 13:05 [Patch net] bridge: add missing vid to br_mdb_get() Cong Wang
@ 2013-03-07 15:18 ` Vlad Yasevich
2013-03-07 21:34 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Vlad Yasevich @ 2013-03-07 15:18 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, Stephen Hemminger, David S. Miller
On 03/07/2013 08:05 AM, Cong Wang wrote:
> From: Cong Wang <amwang@redhat.com>
>
> Obviously, vid should be considered when searching for multicast
> group.
>
> Cc: Vlad Yasevich <vyasevic@redhat.com>
Don't know how I missied that...
Acked-by: Vlad Yasevich <vyasevich@redhat.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
>
> ---
> diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
> index d5f1d3f..314c73e 100644
> --- a/net/bridge/br_device.c
> +++ b/net/bridge/br_device.c
> @@ -66,7 +66,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
> goto out;
> }
>
> - mdst = br_mdb_get(br, skb);
> + mdst = br_mdb_get(br, skb, vid);
> if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
> br_multicast_deliver(mdst, skb);
> else
> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index 4803301..828e2bc 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
> @@ -97,7 +97,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
> if (is_broadcast_ether_addr(dest))
> skb2 = skb;
> else if (is_multicast_ether_addr(dest)) {
> - mdst = br_mdb_get(br, skb);
> + mdst = br_mdb_get(br, skb, vid);
> if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
> if ((mdst && mdst->mglist) ||
> br_multicast_is_router(br))
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index 10e6fce..923fbea 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -132,7 +132,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(
> #endif
>
> struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
> - struct sk_buff *skb)
> + struct sk_buff *skb, u16 vid)
> {
> struct net_bridge_mdb_htable *mdb = rcu_dereference(br->mdb);
> struct br_ip ip;
> @@ -144,6 +144,7 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
> return NULL;
>
> ip.proto = skb->protocol;
> + ip.vid = vid;
>
> switch (skb->protocol) {
> case htons(ETH_P_IP):
> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
> index 6d314c4..3cbf5be 100644
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -442,7 +442,7 @@ extern int br_multicast_rcv(struct net_bridge *br,
> struct net_bridge_port *port,
> struct sk_buff *skb);
> extern struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
> - struct sk_buff *skb);
> + struct sk_buff *skb, u16 vid);
> extern void br_multicast_add_port(struct net_bridge_port *port);
> extern void br_multicast_del_port(struct net_bridge_port *port);
> extern void br_multicast_enable_port(struct net_bridge_port *port);
> @@ -504,7 +504,7 @@ static inline int br_multicast_rcv(struct net_bridge *br,
> }
>
> static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
> - struct sk_buff *skb)
> + struct sk_buff *skb, u16 vid)
> {
> return NULL;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Patch net] bridge: add missing vid to br_mdb_get()
2013-03-07 15:18 ` Vlad Yasevich
@ 2013-03-07 21:34 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-03-07 21:34 UTC (permalink / raw)
To: vyasevic; +Cc: amwang, netdev, stephen
From: Vlad Yasevich <vyasevic@redhat.com>
Date: Thu, 07 Mar 2013 10:18:20 -0500
> On 03/07/2013 08:05 AM, Cong Wang wrote:
>> From: Cong Wang <amwang@redhat.com>
>>
>> Obviously, vid should be considered when searching for multicast
>> group.
>>
>> Cc: Vlad Yasevich <vyasevic@redhat.com>
>
> Don't know how I missied that...
>
> Acked-by: Vlad Yasevich <vyasevich@redhat.com>
>
>> Cc: Stephen Hemminger <stephen@networkplumber.org>
>> Cc: "David S. Miller" <davem@davemloft.net>
>> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-07 21:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-07 13:05 [Patch net] bridge: add missing vid to br_mdb_get() Cong Wang
2013-03-07 15:18 ` Vlad Yasevich
2013-03-07 21:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).