Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2223689,
    "url": "http://patchwork.ozlabs.org/api/1.1/patches/2223689/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260416013101.221555-7-pablo@netfilter.org/",
    "project": {
        "id": 26,
        "url": "http://patchwork.ozlabs.org/api/1.1/projects/26/?format=api",
        "name": "Netfilter Development",
        "link_name": "netfilter-devel",
        "list_id": "netfilter-devel.vger.kernel.org",
        "list_email": "netfilter-devel@vger.kernel.org",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null
    },
    "msgid": "<20260416013101.221555-7-pablo@netfilter.org>",
    "date": "2026-04-16T01:30:53",
    "name": "[net,06/14] netfilter: nf_flow_table_ip: Introduce nf_flow_vlan_push()",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "2d6c9a3fdcc39ec9276a250aab0d1af15126cb12",
    "submitter": {
        "id": 1315,
        "url": "http://patchwork.ozlabs.org/api/1.1/people/1315/?format=api",
        "name": "Pablo Neira Ayuso",
        "email": "pablo@netfilter.org"
    },
    "delegate": {
        "id": 11902,
        "url": "http://patchwork.ozlabs.org/api/1.1/users/11902/?format=api",
        "username": "strlen",
        "first_name": "Florian",
        "last_name": "Westphal",
        "email": "fw@strlen.de"
    },
    "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260416013101.221555-7-pablo@netfilter.org/mbox/",
    "series": [
        {
            "id": 500063,
            "url": "http://patchwork.ozlabs.org/api/1.1/series/500063/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=500063",
            "date": "2026-04-16T01:30:47",
            "name": "[net,01/14] netfilter: nft_fwd_netdev: use recursion counter in neigh egress path",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/500063/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/2223689/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/2223689/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "\n <netfilter-devel+bounces-11952-incoming=patchwork.ozlabs.org@vger.kernel.org>",
        "X-Original-To": [
            "incoming@patchwork.ozlabs.org",
            "netfilter-devel@vger.kernel.org"
        ],
        "Delivered-To": "patchwork-incoming@legolas.ozlabs.org",
        "Authentication-Results": [
            "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=netfilter.org header.i=@netfilter.org\n header.a=rsa-sha256 header.s=2025 header.b=EJItkzQm;\n\tdkim-atps=neutral",
            "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11952-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)",
            "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=\"EJItkzQm\"",
            "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=217.70.190.124",
            "smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org",
            "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=netfilter.org"
        ],
        "Received": [
            "from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fx0rL0l6Yz1yG9\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 16 Apr 2026 11:32:50 +1000 (AEST)",
            "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 7A54B312F30F\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 16 Apr 2026 01:31:33 +0000 (UTC)",
            "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 250FB24A044;\n\tThu, 16 Apr 2026 01:31:19 +0000 (UTC)",
            "from mail.netfilter.org (mail.netfilter.org [217.70.190.124])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 76E9F244692;\n\tThu, 16 Apr 2026 01:31:17 +0000 (UTC)",
            "from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id 466A06024E;\n\tThu, 16 Apr 2026 03:31:15 +0200 (CEST)"
        ],
        "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776303078; cv=none;\n b=LwPxPM8sFhZA6VyDnxqlOhAvrjknwH5dFuKgaL5puoa5cV3bi/QaWG9nqWX+N7w0Um4r+ABmQSW0/lB/TPOoqgVzLGbR/eeiqccfLyQzJWRkMBIz1NAagg5XiXnWucHo1feqRNvgqLez9IgGGziwTpfsFElefnDntoJHsplbNBQ=",
        "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776303078; c=relaxed/simple;\n\tbh=Z6YUIMRuOVp321+8lw9LYyehu6/N0DR1dpuAURrKhrM=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=NzpgGnNEqIikLjr0AGIw/hhYT+xYrjCFOLhQJrL3SLkbyos05v5BetBp1tiRyy3ONX3sxpRTKXiK03mLfiJisQb04Lp9Xa5MlwcNkGqHYcqa26EKBp8v2tq8P7cIlvbjVcXcEhEbuAz0Vny2yBjusK+t6kG+lK9gMjBMerGkAFs=",
        "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org;\n spf=pass smtp.mailfrom=netfilter.org;\n dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=EJItkzQm; arc=none smtp.client-ip=217.70.190.124",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org;\n\ts=2025; t=1776303075;\n\tbh=Ahs+WJN8L1pfM+4/Cbsu/C8n7IwarIzR7hF4whbKjDM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EJItkzQmlWyBzco2la2moj/HCmhgxrvHu3hHbxIPWenaI/cjXqbSMgrQq2lWCAaop\n\t HyxYtVRzv+5O1CHSJSUPPhGbXIruPa1JA9B7nQ09KMFA6JmkEzxbJNb1cwhbpCitnx\n\t gEqg+wZCsRr6QMtxoPA/jbMUHok80ulr5kWL6S7aMfL56T6Bk9H9oYLrpdIqw359I9\n\t 2dRLkFEHz36wP59m7ncH6W43QJeJf6odsd716Plnc9SqpSu5q+OrEqMoLdHW7zuQYG\n\t 7kQK73a7MjRD7sYCK7lubDSfiTeUvagRoet4ZbtOguKax0ry7ePZnAuUs3t3rYiTdF\n\t qIbuFrpiMKfQw==",
        "From": "Pablo Neira Ayuso <pablo@netfilter.org>",
        "To": "netfilter-devel@vger.kernel.org",
        "Cc": "davem@davemloft.net,\n\tnetdev@vger.kernel.org,\n\tkuba@kernel.org,\n\tpabeni@redhat.com,\n\tedumazet@google.com,\n\tfw@strlen.de,\n\thorms@kernel.org",
        "Subject": "[PATCH net 06/14] netfilter: nf_flow_table_ip: Introduce\n nf_flow_vlan_push()",
        "Date": "Thu, 16 Apr 2026 03:30:53 +0200",
        "Message-ID": "<20260416013101.221555-7-pablo@netfilter.org>",
        "X-Mailer": "git-send-email 2.47.3",
        "In-Reply-To": "<20260416013101.221555-1-pablo@netfilter.org>",
        "References": "<20260416013101.221555-1-pablo@netfilter.org>",
        "Precedence": "bulk",
        "X-Mailing-List": "netfilter-devel@vger.kernel.org",
        "List-Id": "<netfilter-devel.vger.kernel.org>",
        "List-Subscribe": "<mailto:netfilter-devel+subscribe@vger.kernel.org>",
        "List-Unsubscribe": "<mailto:netfilter-devel+unsubscribe@vger.kernel.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit"
    },
    "content": "From: Eric Woudstra <ericwouds@gmail.com>\n\nCalling skb_reset_mac_header() before calling skb_vlan_push() does\nremove the error:\n\n\"skb_vlan_push got skb with skb->data not at mac header (offset 18)\"\n\nBut the inner vlan tag is still not inserted correctly.\n\nskb_vlan_push() uses __vlan_insert_inner_tag() to insert the tag\nat offset ETH_HLEN. But the inner tag should only be pushed, without\noffset, similar to nf_flow_pppoe_push().\n\nFixes: c653d5a78f34 (\"netfilter: flowtable: inline vlan encapsulation in xmit path\")\nFixes: a3aca98aec9a (\"netfilter: nf_flow_table_ip: reset mac header before vlan push\")\nSigned-off-by: Eric Woudstra <ericwouds@gmail.com>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n net/netfilter/nf_flow_table_ip.c | 25 ++++++++++++++++++++++---\n 1 file changed, 22 insertions(+), 3 deletions(-)",
    "diff": "diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c\nindex fd56d663cb5b..0086f8a1a0d6 100644\n--- a/net/netfilter/nf_flow_table_ip.c\n+++ b/net/netfilter/nf_flow_table_ip.c\n@@ -544,6 +544,26 @@ static int nf_flow_offload_forward(struct nf_flowtable_ctx *ctx,\n \treturn 1;\n }\n \n+static int nf_flow_vlan_push(struct sk_buff *skb, __be16 proto, u16 id)\n+{\n+\tif (skb_vlan_tag_present(skb)) {\n+\t\tstruct vlan_hdr *vhdr;\n+\n+\t\tif (skb_cow_head(skb, VLAN_HLEN))\n+\t\t\treturn -1;\n+\n+\t\t__skb_push(skb, VLAN_HLEN);\n+\t\tskb_reset_network_header(skb);\n+\t\tvhdr = (struct vlan_hdr *)(skb->data);\n+\t\tvhdr->h_vlan_TCI = htons(id);\n+\t\tvhdr->h_vlan_encapsulated_proto = skb->protocol;\n+\t\tskb->protocol = proto;\n+\t} else {\n+\t\t__vlan_hwaccel_put_tag(skb, proto, id);\n+\t}\n+\treturn 0;\n+}\n+\n static int nf_flow_pppoe_push(struct sk_buff *skb, u16 id)\n {\n \tint data_len = skb->len + sizeof(__be16);\n@@ -738,9 +758,8 @@ static int nf_flow_encap_push(struct sk_buff *skb,\n \t\tswitch (tuple->encap[i].proto) {\n \t\tcase htons(ETH_P_8021Q):\n \t\tcase htons(ETH_P_8021AD):\n-\t\t\tskb_reset_mac_header(skb);\n-\t\t\tif (skb_vlan_push(skb, tuple->encap[i].proto,\n-\t\t\t\t\t  tuple->encap[i].id) < 0)\n+\t\t\tif (nf_flow_vlan_push(skb, tuple->encap[i].proto,\n+\t\t\t\t\t      tuple->encap[i].id) < 0)\n \t\t\t\treturn -1;\n \t\t\tbreak;\n \t\tcase htons(ETH_P_PPP_SES):\n",
    "prefixes": [
        "net",
        "06/14"
    ]
}