{"id":818845,"url":"http://patchwork.ozlabs.org/api/patches/818845/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1506464764-12699-6-git-send-email-andrew@lunn.ch/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<1506464764-12699-6-git-send-email-andrew@lunn.ch>","list_archive_url":null,"date":"2017-09-26T22:26:02","name":"[net-next,5/6] net: dsa: mv88e6xxx: Move mv88e6xxx_port_db_load_purge()","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"69ace4accd092a9262d9b4dc5fb1c6b9bfc22954","submitter":{"id":13608,"url":"http://patchwork.ozlabs.org/api/people/13608/?format=json","name":"Andrew Lunn","email":"andrew@lunn.ch"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1506464764-12699-6-git-send-email-andrew@lunn.ch/mbox/","series":[{"id":5236,"url":"http://patchwork.ozlabs.org/api/series/5236/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5236","date":"2017-09-26T22:26:00","name":"mv88e6xxx broadcast flooding in hardware","version":1,"mbox":"http://patchwork.ozlabs.org/series/5236/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818845/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818845/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 3y1wZ40rqXz9s3T\n\tfor ;\n\tWed, 27 Sep 2017 08:27:40 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S969625AbdIZW1i (ORCPT );\n\tTue, 26 Sep 2017 18:27:38 -0400","from vps0.lunn.ch ([185.16.172.187]:57019 \"EHLO vps0.lunn.ch\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S969562AbdIZW1h (ORCPT );\n\tTue, 26 Sep 2017 18:27:37 -0400","from andrew by vps0.lunn.ch with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dwyIq-0003Jn-Ts; Wed, 27 Sep 2017 00:26:08 +0200"],"From":"Andrew Lunn ","To":"David Miller ","Cc":"Vivien Didelot ,\n\tnetdev , Andrew Lunn ","Subject":"[PATCH net-next 5/6] net: dsa: mv88e6xxx: Move\n\tmv88e6xxx_port_db_load_purge()","Date":"Wed, 27 Sep 2017 00:26:02 +0200","Message-Id":"<1506464764-12699-6-git-send-email-andrew@lunn.ch>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1506464764-12699-1-git-send-email-andrew@lunn.ch>","References":"<1506464764-12699-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":"This function is going to be needed by a soon to be added new\nfunction. Move it earlier so we can avoid a forward declaration.\nNo code changes.\n\nSigned-off-by: Andrew Lunn \n---\n drivers/net/dsa/mv88e6xxx/chip.c | 88 ++++++++++++++++++++--------------------\n 1 file changed, 44 insertions(+), 44 deletions(-)","diff":"diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c\nindex 8a4756490a5a..9fbe1f02b9ce 100644\n--- a/drivers/net/dsa/mv88e6xxx/chip.c\n+++ b/drivers/net/dsa/mv88e6xxx/chip.c\n@@ -1191,6 +1191,50 @@ mv88e6xxx_port_vlan_prepare(struct dsa_switch *ds, int port,\n \treturn 0;\n }\n \n+static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,\n+\t\t\t\t\tconst unsigned char *addr, u16 vid,\n+\t\t\t\t\tu8 state)\n+{\n+\tstruct mv88e6xxx_vtu_entry vlan;\n+\tstruct mv88e6xxx_atu_entry entry;\n+\tint err;\n+\n+\t/* Null VLAN ID corresponds to the port private database */\n+\tif (vid == 0)\n+\t\terr = mv88e6xxx_port_get_fid(chip, port, &vlan.fid);\n+\telse\n+\t\terr = mv88e6xxx_vtu_get(chip, vid, &vlan, false);\n+\tif (err)\n+\t\treturn err;\n+\n+\tentry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;\n+\tether_addr_copy(entry.mac, addr);\n+\teth_addr_dec(entry.mac);\n+\n+\terr = mv88e6xxx_g1_atu_getnext(chip, vlan.fid, &entry);\n+\tif (err)\n+\t\treturn err;\n+\n+\t/* Initialize a fresh ATU entry if it isn't found */\n+\tif (entry.state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED ||\n+\t !ether_addr_equal(entry.mac, addr)) {\n+\t\tmemset(&entry, 0, sizeof(entry));\n+\t\tether_addr_copy(entry.mac, addr);\n+\t}\n+\n+\t/* Purge the ATU entry only if no port is using it anymore */\n+\tif (state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {\n+\t\tentry.portvec &= ~BIT(port);\n+\t\tif (!entry.portvec)\n+\t\t\tentry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;\n+\t} else {\n+\t\tentry.portvec |= BIT(port);\n+\t\tentry.state = state;\n+\t}\n+\n+\treturn mv88e6xxx_g1_atu_loadpurge(chip, vlan.fid, &entry);\n+}\n+\n static int _mv88e6xxx_port_vlan_add(struct mv88e6xxx_chip *chip, int port,\n \t\t\t\t u16 vid, u8 member)\n {\n@@ -1307,50 +1351,6 @@ static int mv88e6xxx_port_vlan_del(struct dsa_switch *ds, int port,\n \treturn err;\n }\n \n-static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,\n-\t\t\t\t\tconst unsigned char *addr, u16 vid,\n-\t\t\t\t\tu8 state)\n-{\n-\tstruct mv88e6xxx_vtu_entry vlan;\n-\tstruct mv88e6xxx_atu_entry entry;\n-\tint err;\n-\n-\t/* Null VLAN ID corresponds to the port private database */\n-\tif (vid == 0)\n-\t\terr = mv88e6xxx_port_get_fid(chip, port, &vlan.fid);\n-\telse\n-\t\terr = mv88e6xxx_vtu_get(chip, vid, &vlan, false);\n-\tif (err)\n-\t\treturn err;\n-\n-\tentry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;\n-\tether_addr_copy(entry.mac, addr);\n-\teth_addr_dec(entry.mac);\n-\n-\terr = mv88e6xxx_g1_atu_getnext(chip, vlan.fid, &entry);\n-\tif (err)\n-\t\treturn err;\n-\n-\t/* Initialize a fresh ATU entry if it isn't found */\n-\tif (entry.state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED ||\n-\t !ether_addr_equal(entry.mac, addr)) {\n-\t\tmemset(&entry, 0, sizeof(entry));\n-\t\tether_addr_copy(entry.mac, addr);\n-\t}\n-\n-\t/* Purge the ATU entry only if no port is using it anymore */\n-\tif (state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {\n-\t\tentry.portvec &= ~BIT(port);\n-\t\tif (!entry.portvec)\n-\t\t\tentry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;\n-\t} else {\n-\t\tentry.portvec |= BIT(port);\n-\t\tentry.state = state;\n-\t}\n-\n-\treturn mv88e6xxx_g1_atu_loadpurge(chip, vlan.fid, &entry);\n-}\n-\n static int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,\n \t\t\t\t const unsigned char *addr, u16 vid)\n {\n","prefixes":["net-next","5/6"]}