From patchwork Wed Jul 22 04:57:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 498402 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 EB6E714027F for ; Wed, 22 Jul 2015 14:57:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753941AbbGVE5L (ORCPT ); Wed, 22 Jul 2015 00:57:11 -0400 Received: from mga09.intel.com ([134.134.136.24]:20526 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbbGVE5K (ORCPT ); Wed, 22 Jul 2015 00:57:10 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 21 Jul 2015 21:57:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,520,1432623600"; d="scan'208";a="528092193" Received: from imail001.iil.intel.com ([10.184.207.12]) by FMSMGA003.fm.intel.com with ESMTP; 21 Jul 2015 21:57:07 -0700 Received: from s.iil.intel.com (s.iil.intel.com [143.185.141.152]) by imail001.iil.intel.com with ESMTP id t6M4v4I9028939; Wed, 22 Jul 2015 07:57:04 +0300 From: Rami Rosen To: davem@davemloft.net Cc: netdev@vger.kernel.org, roopa@cumulusnetworks.com, stephen@networkplumber.org, Rami Rosen Subject: [PATCH net-next v2] bridge: Fix setting a flag in br_fill_ifvlaninfo_range(). Date: Wed, 22 Jul 2015 07:57:02 +0300 Message-Id: <1437541022-14250-1-git-send-email-rami.rosen@intel.com> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes setting of vinfo.flags in the br_fill_ifvlaninfo_range() method. The assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect and is unneeded, as vinfo.flags value is overriden by the immediately following vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement. Signed-off-by: Rami Rosen Acked-by: Roopa Prabhu --- net/bridge/br_netlink.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 364bdc9..793d247 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -164,8 +164,6 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start, sizeof(vinfo), &vinfo)) goto nla_put_failure; - vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN; - vinfo.vid = vid_end; vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END; if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,