{"id":810320,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810320/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504654510-31004-3-git-send-email-andrew@lunn.ch/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504654510-31004-3-git-send-email-andrew@lunn.ch>","list_archive_url":null,"date":"2017-09-05T23:35:04","name":"[v2,rfc,2/8] net: bridge: Send notification when host join/leaves a group","commit_ref":null,"pull_url":null,"state":"rfc","archived":true,"hash":"9847d9ec78006eadd732fd1ab768995bd9c2dbf1","submitter":{"id":13608,"url":"http://patchwork.ozlabs.org/api/1.2/people/13608/?format=json","name":"Andrew Lunn","email":"andrew@lunn.ch"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504654510-31004-3-git-send-email-andrew@lunn.ch/mbox/","series":[{"id":1666,"url":"http://patchwork.ozlabs.org/api/1.2/series/1666/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1666","date":"2017-09-05T23:35:04","name":"IGMP snooping for local traffic","version":2,"mbox":"http://patchwork.ozlabs.org/series/1666/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810320/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810320/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xn346324Cz9s7h\n\tfor ;\n\tWed, 6 Sep 2017 09:35:34 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753611AbdIEXfc (ORCPT );\n\tTue, 5 Sep 2017 19:35:32 -0400","from vps0.lunn.ch ([178.209.37.122]:58191 \"EHLO vps0.lunn.ch\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752717AbdIEXfb (ORCPT );\n\tTue, 5 Sep 2017 19:35:31 -0400","from andrew by vps0.lunn.ch with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dpNNG-00084n-GM; Wed, 06 Sep 2017 01:35:18 +0200"],"From":"Andrew Lunn ","To":"netdev ","Cc":"jiri@resnulli.us, nikolay@cumulusnetworks.com,\n\tFlorian Fainelli ,\n\tVivien Didelot ,\n\tAndrew Lunn ","Subject":"[PATCH v2 rfc 2/8] net: bridge: Send notification when host\n\tjoin/leaves a group","Date":"Wed, 6 Sep 2017 01:35:04 +0200","Message-Id":"<1504654510-31004-3-git-send-email-andrew@lunn.ch>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504654510-31004-1-git-send-email-andrew@lunn.ch>","References":"<1504654510-31004-1-git-send-email-andrew@lunn.ch>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The host can join or leave a multicast group on the brX interface, as\nindicated by IGMP snooping. This is tracked within the bridge\nmulticast code. Send a notification when this happens, in the same way\na notification is sent when a port of the bridge joins/leaves a group\nbecause of IGMP snooping.\n\nSigned-off-by: Andrew Lunn \n---\n net/bridge/br_mdb.c | 9 ++++++---\n net/bridge/br_multicast.c | 6 +++++-\n 2 files changed, 11 insertions(+), 4 deletions(-)","diff":"diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c\nindex 71885e251988..80fa91ccc50c 100644\n--- a/net/bridge/br_mdb.c\n+++ b/net/bridge/br_mdb.c\n@@ -316,7 +316,7 @@ static void __br_mdb_notify(struct net_device *dev, struct net_bridge_port *p,\n #endif\n \n \tmdb.obj.orig_dev = port_dev;\n-\tif (port_dev && type == RTM_NEWMDB) {\n+\tif (p && port_dev && type == RTM_NEWMDB) {\n \t\tcomplete_info = kmalloc(sizeof(*complete_info), GFP_ATOMIC);\n \t\tif (complete_info) {\n \t\t\tcomplete_info->port = p;\n@@ -326,7 +326,7 @@ static void __br_mdb_notify(struct net_device *dev, struct net_bridge_port *p,\n \t\t\tif (switchdev_port_obj_add(port_dev, &mdb.obj))\n \t\t\t\tkfree(complete_info);\n \t\t}\n-\t} else if (port_dev && type == RTM_DELMDB) {\n+\t} else if (p && port_dev && type == RTM_DELMDB) {\n \t\tswitchdev_port_obj_del(port_dev, &mdb.obj);\n \t}\n \n@@ -352,7 +352,10 @@ void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,\n \tstruct br_mdb_entry entry;\n \n \tmemset(&entry, 0, sizeof(entry));\n-\tentry.ifindex = port->dev->ifindex;\n+\tif (port)\n+\t\tentry.ifindex = port->dev->ifindex;\n+\telse\n+\t\tentry.ifindex = dev->ifindex;\n \tentry.addr.proto = group->proto;\n \tentry.addr.u.ip4 = group->u.ip4;\n #if IS_ENABLED(CONFIG_IPV6)\ndiff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c\nindex c6b2b8d419e7..955f340fe719 100644\n--- a/net/bridge/br_multicast.c\n+++ b/net/bridge/br_multicast.c\n@@ -250,6 +250,7 @@ static void br_multicast_group_expired(unsigned long data)\n \t\tgoto out;\n \n \tmp->host_joined = false;\n+\tbr_mdb_notify(br->dev, NULL, &mp->addr, RTM_DELMDB, 0);\n \n \tif (mp->ports)\n \t\tgoto out;\n@@ -775,7 +776,10 @@ static int br_multicast_add_group(struct net_bridge *br,\n \t\tgoto err;\n \n \tif (!port) {\n-\t\tmp->host_joined = true;\n+\t\tif (!mp->host_joined) {\n+\t\t\tmp->host_joined = true;\n+\t\t\tbr_mdb_notify(br->dev, NULL, &mp->addr, RTM_NEWMDB, 0);\n+\t\t}\n \t\tmod_timer(&mp->timer, now + br->multicast_membership_interval);\n \t\tgoto out;\n \t}\n","prefixes":["v2","rfc","2/8"]}