From patchwork Fri May 15 14:27:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 472731 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 65BD1140309 for ; Fri, 15 May 2015 21:37:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934322AbbEOLhH (ORCPT ); Fri, 15 May 2015 07:37:07 -0400 Received: from mga11.intel.com ([192.55.52.93]:19592 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933827AbbEOLhF (ORCPT ); Fri, 15 May 2015 07:37:05 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 15 May 2015 04:37:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,433,1427785200"; d="scan'208";a="571832247" Received: from imail001.iil.intel.com ([10.184.207.12]) by orsmga003.jf.intel.com with ESMTP; 15 May 2015 04:37:02 -0700 Received: from pae-samba.iil.intel.com (pae-samba.iil.intel.com [143.185.141.152]) by imail001.iil.intel.com with ESMTP id t4FBawdf030762; Fri, 15 May 2015 14:36:59 +0300 From: Rami Rosen To: davem@davemloft.net Cc: netdev@vger.kernel.org, roopa@cumulusnetworks.com, ronen.arad@intel.com, Rami Rosen Subject: [PATCH net-next] bridge: Fix setting a flag in br_fill_ifvlaninfo_range(). Date: Fri, 15 May 2015 17:27:27 +0300 Message-Id: <1431700047-22560-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(). The assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect without this patch, as vinfo.flags value is overriden by the vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement, which follows it immedialtely. Signed-off-by: Rami Rosen --- net/bridge/br_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 6b67ed3..fec65bb 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -167,7 +167,7 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start, vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN; vinfo.vid = vid_end; - vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END; + vinfo.flags &= flags | BRIDGE_VLAN_INFO_RANGE_END; if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO, sizeof(vinfo), &vinfo)) goto nla_put_failure;