From patchwork Thu Nov 8 17:44:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 995068 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="c5jHvTzo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42rVzZ2mNxz9sDC for ; Fri, 9 Nov 2018 04:44:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726975AbeKIDV0 (ORCPT ); Thu, 8 Nov 2018 22:21:26 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:17748 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726710AbeKIDVZ (ORCPT ); Thu, 8 Nov 2018 22:21:25 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42rVyJ1fgyzTQ; Thu, 8 Nov 2018 18:43:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541699032; bh=VVRXG7lVoopHcEiP5IbvZyFHZN6TX/bZYpL2LvLGrF4=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=c5jHvTzons0HzETlEyjxow8wRGo8W/k55HxYb70FJj3RSlWxk8ms845i6Pz7CZzEN +ZJfuwwd7zTHAqWGgSRhUYNHqBhOOzaZnwFpE9pxSkPCQZiWCNTw5EKp6wDPb2Gxd9 +hZAiRmyKmTDqPmH9WTY/AMDLiyqpMqmy3+i4R2h1t4vVt0HaXSBa2WlgnMB2q96Iq FmTdxwzltp7bynm2ifqqrNnRM+qNtVXuakCOBTJQNUqMdbKEhHCQxdNAATDN6nWvib 1jzgGCJCvolTFpbQHwmx/65GUfZraCKLYkKhVvfxIBTQa9oGX3XVGM2SOoUVpnZCvP tHUp/rhmQEx+A== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Thu, 08 Nov 2018 18:44:50 +0100 Message-Id: <39c6d1c6e85a758b9988407ecc98883317648b38.1541698641.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 2/4] cnic: remove use of VLAN_TAG_PRESENT MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Claudiu Manoil , Faisal Latif , Pravin B Shelar , Shiraz Saleem , dev@openvswitch.org, linux-rdma@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This just removes VLAN_TAG_PRESENT use. VLAN TCI=0 special meaning is deeply embedded in the driver code and so is left as is. Signed-off-by: Michał Mirosław --- drivers/net/ethernet/broadcom/cnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index d83233ae4a15..510dfc1c236b 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -5731,7 +5731,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, if (realdev) { dev = cnic_from_netdev(realdev); if (dev) { - vid |= VLAN_TAG_PRESENT; + vid |= VLAN_CFI_MASK; /* make non-zero */ cnic_rcv_netevent(dev->cnic_priv, event, vid); cnic_put(dev); }