Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/534733/?format=api
{ "id": 534733, "url": "http://patchwork.ozlabs.org/api/patches/534733/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445572173-15402-5-git-send-email-makita.toshiaki@lab.ntt.co.jp/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1445572173-15402-5-git-send-email-makita.toshiaki@lab.ntt.co.jp>", "list_archive_url": null, "date": "2015-10-23T03:49:33", "name": "[net-next,4/4] bridge: Notify port device of encap header length", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ddecc973c24edcd7a4fe12abc54dfc659d8dac19", "submitter": { "id": 22461, "url": "http://patchwork.ozlabs.org/api/people/22461/?format=api", "name": "Toshiaki Makita", "email": "makita.toshiaki@lab.ntt.co.jp" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445572173-15402-5-git-send-email-makita.toshiaki@lab.ntt.co.jp/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/534733/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/534733/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id C0BBB141314\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 23 Oct 2015 15:28:52 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 84A9E8BDF7;\n\tFri, 23 Oct 2015 04:28:51 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id nYmZWFY9j_Sw; Fri, 23 Oct 2015 04:28:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5AD748B9BE;\n\tFri, 23 Oct 2015 04:28:49 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6E97A1C105D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Oct 2015 04:28:48 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 649C330129\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Oct 2015 04:28:48 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id WRRADbr7x7zm for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Oct 2015 04:28:46 +0000 (UTC)", "from tama500.ecl.ntt.co.jp (tama500.ecl.ntt.co.jp [129.60.39.148])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8EE623007A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Oct 2015 04:28:46 +0000 (UTC)", "from vc2.ecl.ntt.co.jp (vc2.ecl.ntt.co.jp [129.60.86.154])\n\tby tama500.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id t9N3niEG012460;\n\tFri, 23 Oct 2015 12:49:44 +0900", "from vc2.ecl.ntt.co.jp (localhost [127.0.0.1])\n\tby vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 688C35F612;\n\tFri, 23 Oct 2015 12:49:44 +0900 (JST)", "from imail3.m.ecl.ntt.co.jp (imail3.m.ecl.ntt.co.jp [129.60.5.248])\n\tby vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 5A2F35F58E;\n\tFri, 23 Oct 2015 12:49:44 +0900 (JST)", "from ubuntu-vm-makita ([129.60.241.200])\n\tby imail3.m.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id\n\tt9N3nhtM026709; Fri, 23 Oct 2015 12:49:44 +0900", "by ubuntu-vm-makita (Postfix, from userid 1000)\n\tid D2EA61E6EFC; Fri, 23 Oct 2015 12:49:37 +0900 (JST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "delayed 00:38:56 by SQLgrey-1.7.6", "From": "Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>", "To": "\"David S . Miller\" <davem@davemloft.net>", "Date": "Fri, 23 Oct 2015 12:49:33 +0900", "Message-Id": "<1445572173-15402-5-git-send-email-makita.toshiaki@lab.ntt.co.jp>", "X-Mailer": "git-send-email 1.8.1.2", "In-Reply-To": "<1445572173-15402-1-git-send-email-makita.toshiaki@lab.ntt.co.jp>", "References": "<1445572173-15402-1-git-send-email-makita.toshiaki@lab.ntt.co.jp>", "X-TM-AS-MML": "disable", "Cc": "netdev@vger.kernel.org, Vlad Yasevich <vyasevich@gmail.com>,\n\tStephen Hemminger <stephen@networkplumber.org>,\n\tintel-wired-lan@lists.osuosl.org,\n\tToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>,\n\tPatrick McHardy <kaber@trash.net>", "Subject": "[Intel-wired-lan] [PATCH net-next 4/4] bridge: Notify port device\n\tof encap header length", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "If vlan is assigned to a port, notify the port of 4 bytes header length,\nor 8 bytes if 802.1ad.\n\nSigned-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>\n---\n net/bridge/br_vlan.c | 18 ++++++++++++++++++\n 1 file changed, 18 insertions(+)", "diff": "diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c\nindex 5f0d0cc..9c678de 100644\n--- a/net/bridge/br_vlan.c\n+++ b/net/bridge/br_vlan.c\n@@ -208,6 +208,8 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)\n \t}\n \n \tif (p) {\n+\t\tint enc_hdr_len;\n+\n \t\t/* Add VLAN to the device filter if it is supported.\n \t\t * This ensures tagged traffic enters the bridge when\n \t\t * promiscuous mode is disabled by br_manage_promisc().\n@@ -228,6 +230,13 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)\n \t\tif (!masterv)\n \t\t\tgoto out_filt;\n \t\tv->brvlan = masterv;\n+\n+\t\tif (!vg->num_vlans) {\n+\t\t\tenc_hdr_len = VLAN_HLEN;\n+\t\t\tif (br->vlan_proto == htons(ETH_P_8021AD))\n+\t\t\t\tenc_hdr_len += VLAN_HLEN;\n+\t\t\tdev_set_enc_hdr_len(dev, enc_hdr_len);\n+\t\t}\n \t}\n \n \t/* Add the dev mac and count the vlan only if it's usable */\n@@ -667,6 +676,15 @@ int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)\n \t\t}\n \t}\n \n+\tif (proto == htons(ETH_P_8021AD)) {\n+\t\tlist_for_each_entry(p, &br->port_list, list) {\n+\t\t\tif (!p->vlgrp->num_vlans)\n+\t\t\t\tcontinue;\n+\n+\t\t\tdev_set_enc_hdr_len(p->dev, VLAN_HLEN * 2);\n+\t\t}\n+\t}\n+\n \toldproto = br->vlan_proto;\n \tbr->vlan_proto = proto;\n \n", "prefixes": [ "net-next", "4/4" ] }