From patchwork Mon Sep 19 15:53:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 671821 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sd9Rb0wkJz9sCZ for ; Tue, 20 Sep 2016 01:54:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=zbw+55Y1; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752278AbcISPyA (ORCPT ); Mon, 19 Sep 2016 11:54:00 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35273 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751414AbcISPx6 (ORCPT ); Mon, 19 Sep 2016 11:53:58 -0400 Received: by mail-wm0-f66.google.com with SMTP id 133so15710086wmq.2 for ; Mon, 19 Sep 2016 08:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZOn78iHGJm8BXOvaeKIm5Q9WsOf4YnVxechtoR9MYEI=; b=zbw+55Y1GexAHOx9GztZXdwgfufj3W55WLfJYRT0CyJcPB2kW0fZOcj1HHAKX7vzBZ 7leWtrQvxELL+8lGvZssvwwLMphUQ64K0LZxYm1VEtu23WL07r1Iqw46JsLxRmKDYKzR TOLLg8NB1poizZmnVozj6n7ZYByScASvlwdkZoZap6ZQ6JpirbQE8WKBIqY2q1VTOgEP ZRC32fZ13xm6tYu0He1AT3nwEhfoyK1iiobWHPaVl2PlKIL2a3EsftzPoql5Y35fQRTN hNlXO2ZsHYXn6cq+x6l0wN46RAiRB81PaCuEbpT5EwJcDthUQHQWIBMa7I1V2FAhMbid WVHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZOn78iHGJm8BXOvaeKIm5Q9WsOf4YnVxechtoR9MYEI=; b=bEUgp3nuYlDMEbjd+X205/zZpZ2jv3JRXuV3ge2CoysffBMEKzyAlsGrhpPbutnl6x 93Sm7t92r+pDW0yYpDiGWLcbuwgTs+fEGqO6flRZQPyNJtgOTg9YOjd2SYxs5JOzFrEE /LUvQjffDzUfT96Pu1zQilThddzGWvMcYcUPuPwixeWItDVxHQZpd24MLwk8lqz7/syN gJwTHUNWzOl/jDgDgZJ36WWh6v8vjAs7hxLPlIEjpPQoolnf3aQqYfEhKUA+c9p46E/2 2AeHcpaJ1IA89r8/nsCO0pAr3Jg6cycRY3mtC79pju8DlAUPAgSwzJ4uIPhV1fKsNoY/ HJUA== X-Gm-Message-State: AE9vXwOa30Lxl+vTPgDpvp7yQmw5Ok4JuERqQWR5BtOiDVEPK0YXAxPeHdkpe9VDyyCfkg== X-Received: by 10.28.197.12 with SMTP id v12mr9431843wmf.11.1474300437198; Mon, 19 Sep 2016 08:53:57 -0700 (PDT) Received: from halley.home ([188.120.154.95]) by smtp.gmail.com with ESMTPSA id d62sm22829223wmd.7.2016.09.19.08.53.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 08:53:56 -0700 (PDT) From: Shmulik Ladkani To: "David S . Miller" Cc: Jiri Pirko , Daniel Borkmann , netdev@vger.kernel.org, Shmulik Ladkani Subject: [PATCH v2 2/2] net: skbuff: Coding: Use eth_type_vlan() instead of open coding it Date: Mon, 19 Sep 2016 18:53:20 +0300 Message-Id: <1474300400-32362-2-git-send-email-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474300400-32362-1-git-send-email-shmulik.ladkani@gmail.com> References: <1474300400-32362-1-git-send-email-shmulik.ladkani@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix 'skb_vlan_pop' to use eth_type_vlan instead of directly comparing skb->protocol to ETH_P_8021Q or ETH_P_8021AD. Signed-off-by: Shmulik Ladkani --- net/core/skbuff.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4dbaedb745..1369faa182 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4535,8 +4535,7 @@ int skb_vlan_pop(struct sk_buff *skb) if (likely(skb_vlan_tag_present(skb))) { skb->vlan_tci = 0; } else { - if (unlikely(skb->protocol != htons(ETH_P_8021Q) && - skb->protocol != htons(ETH_P_8021AD))) + if (unlikely(!eth_type_vlan(skb->protocol))) return 0; err = __skb_vlan_pop(skb, &vlan_tci); @@ -4544,8 +4543,7 @@ int skb_vlan_pop(struct sk_buff *skb) return err; } /* move next vlan tag to hw accel tag */ - if (likely(skb->protocol != htons(ETH_P_8021Q) && - skb->protocol != htons(ETH_P_8021AD))) + if (likely(!eth_type_vlan(skb->protocol))) return 0; vlan_proto = skb->protocol;