From patchwork Wed Oct 16 14:33:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 283962 X-Patchwork-Delegate: shemminger@vyatta.com 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 D36A82C00CE for ; Thu, 17 Oct 2013 01:33:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753796Ab3JPOdY (ORCPT ); Wed, 16 Oct 2013 10:33:24 -0400 Received: from mail-yh0-f46.google.com ([209.85.213.46]:42093 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753536Ab3JPOdW (ORCPT ); Wed, 16 Oct 2013 10:33:22 -0400 Received: by mail-yh0-f46.google.com with SMTP id l109so176128yhq.19 for ; Wed, 16 Oct 2013 07:33:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type; bh=ZcZNAnzWa2DxQZGVLdlMU5kyXUUPazhMIrqDb54T1f0=; b=Sq+qv8xmdlMpBoRsVMSy0XFDvM+high3MqOPZEyiC75SP0zHQzsGpW+9ukikZd8Eh1 hTVd8tek1pi0kO8A1S99zyFjjtILkNbhzCNqOhkr9ZEg6vCzeOj/MTPWRx9REISV7NzR oUWC9CMBvXT47+7dEQNvzvXpxjXSVGChvIIJmM2t8vOLNfbVLc/yeNzQw6nZFYSFSleA O9A0jY5SZzfPEFClH44Iz4X9M1LLHXIsP0tX4uP7nHBCl/uBhWNAB7xhwbA6lS3sI+ky tNZT6QsDC53TefXkGobyZdqKhrILhXai0ne4JdkEsni4sfSrsAPT9uN2YIaU56ROLfiD JyXA== X-Gm-Message-State: ALoCoQm5bXdVoh8O3u2gVPb5WWuEtRKg9/hYm5PcJn4lLNI1W/kvB87MSxgyODmKt+MhQTvCgjdn X-Received: by 10.236.150.48 with SMTP id y36mr1510843yhj.75.1381934000868; Wed, 16 Oct 2013 07:33:20 -0700 (PDT) Received: from [192.168.1.100] (24-246-6-163.cable.teksavvy.com. [24.246.6.163]) by mx.google.com with ESMTPSA id s21sm120497797yhk.9.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Oct 2013 07:33:20 -0700 (PDT) Message-ID: <525EA3AE.9020501@mojatatu.com> Date: Wed, 16 Oct 2013 10:33:18 -0400 From: Jamal Hadi Salim User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Stephen Hemminger CC: "netdev@vger.kernel.org" Subject: [PATCH: Iproute bridge] remove redundant check Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org attached, cheers, jamal commit 355c2d4679e81c1e1c2ae12e03b6a2ced5ebb7d0 Author: Jamal Hadi Salim Date: Wed Oct 16 10:30:01 2013 -0400 [Iproute: bridge] Remove redundant check Signed-off-by: Jamal Hadi Salim diff --git a/bridge/link.c b/bridge/link.c index 38dfaea..ab4a5d5 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -271,7 +271,7 @@ static int brlink_modify(int argc, char **argv) exit(-1); } else if (strcmp(*argv, "hairpin") == 0) { NEXT_ARG(); - if (!on_off("hairping", &hairpin, *argv)) + if (!on_off("hairpin", &hairpin, *argv)) exit(-1); } else if (strcmp(*argv, "fastleave") == 0) { NEXT_ARG(); @@ -357,9 +357,7 @@ static int brlink_modify(int argc, char **argv) nest = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC); addattr16(&req.n, sizeof(req), IFLA_BRIDGE_FLAGS, flags); - - if (mode >= 0) - addattr16(&req.n, sizeof(req), IFLA_BRIDGE_MODE, mode); + addattr16(&req.n, sizeof(req), IFLA_BRIDGE_MODE, mode); addattr_nest_end(&req.n, nest); }