From patchwork Mon Jan 19 09:45:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 430297 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 9F44C1401F6 for ; Mon, 19 Jan 2015 16:53:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750766AbbASFxt (ORCPT ); Mon, 19 Jan 2015 00:53:49 -0500 Received: from mga02.intel.com ([134.134.136.20]:9708 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbbASFxs (ORCPT ); Mon, 19 Jan 2015 00:53:48 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 18 Jan 2015 21:53:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,424,1418112000"; d="scan'208";a="663888371" Received: from imail001.iil.intel.com ([10.184.207.12]) by fmsmga002.fm.intel.com with ESMTP; 18 Jan 2015 21:53:46 -0800 Received: from pae-samba.iil.intel.com (pae-samba.iil.intel.com [143.185.141.77]) by imail001.iil.intel.com with ESMTP id t0J5rhhx007206; Mon, 19 Jan 2015 07:53:43 +0200 From: Rami Rosen To: davem@davemloft.net Cc: netdev@vger.kernel.org, roopa@cumulusnetworks.com, hemminger@vyatta.com, Rami Rosen Subject: [PATCH net-next] bridge: remove oflags from setlink/dellink. Date: Mon, 19 Jan 2015 11:45:04 +0200 Message-Id: <1421660704-5122-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 Commit 02dba4388d16 ("bridge: fix setlink/dellink notifications") removed usage of oflags in both rtnl_bridge_setlink() and rtnl_bridge_dellink() methods. This patch removes this variable as it is no longer needed. Signed-off-by: Rami Rosen --- net/core/rtnetlink.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 0e26b9f..47b39f3 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2918,7 +2918,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh) struct net_device *dev; struct nlattr *br_spec, *attr = NULL; int rem, err = -EOPNOTSUPP; - u16 oflags, flags = 0; + u16 flags = 0; bool have_flags = false; if (nlmsg_len(nlh) < sizeof(*ifm)) @@ -2948,8 +2948,6 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh) } } - oflags = flags; - if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { struct net_device *br_dev = netdev_master_upper_dev_get(dev); @@ -2993,7 +2991,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh) struct net_device *dev; struct nlattr *br_spec, *attr = NULL; int rem, err = -EOPNOTSUPP; - u16 oflags, flags = 0; + u16 flags = 0; bool have_flags = false; if (nlmsg_len(nlh) < sizeof(*ifm)) @@ -3023,8 +3021,6 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh) } } - oflags = flags; - if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { struct net_device *br_dev = netdev_master_upper_dev_get(dev);