From patchwork Sun Jun 15 10:05:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UGV0ZXIgUGFuKOa9mOWNq+W5syk=?= X-Patchwork-Id: 359826 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 83E6E14009B for ; Sun, 15 Jun 2014 20:06:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751048AbaFOKGB (ORCPT ); Sun, 15 Jun 2014 06:06:01 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:55636 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968AbaFOKF7 (ORCPT ); Sun, 15 Jun 2014 06:05:59 -0400 Received: by mail-pd0-f178.google.com with SMTP id r10so3444804pdi.23 for ; Sun, 15 Jun 2014 03:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=isbtJtqVxTkHmsdXmwB0NsQOiFrgBJg0u0Vz9cIe1Qg=; b=wmICawte/GvXS9zBw5Wisrkel4yxPn/0dUPr/s2uXJ1t2SHCJAoqDwHIwgKV1/tjsc 356Sntr8sFqHx0xE3C/wIAzEVaZHoQ+DwcgCu/MBkUryDzbBZ7ERQ3bH+GFAkK3uOL0z ioiF3D3K+qZql2/ASk/xHn7gfYit23WuQF1RGJqsrCctoAg80zltE6DT+szKQFjMnVdi /dwwWgSvnu/Qbf7SNfdToUkcH+kphsukmqT8x1ZxXJFWuTKwA8RD0EzcT2xRtwLk0n9F aZsfLgeFgTXeduZbGyJ3YseBV8+dmnB8zWV4YVHQkUP3MPkLVmmJJF4bOVbB6okADLQo YY6Q== X-Received: by 10.66.66.108 with SMTP id e12mr16124492pat.35.1402826759315; Sun, 15 Jun 2014 03:05:59 -0700 (PDT) Received: from localhost.localdomain.com ([221.219.210.251]) by mx.google.com with ESMTPSA id gd7sm50615760pac.34.2014.06.15.03.05.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2014 03:05:58 -0700 (PDT) From: Weiping Pan To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, Weiping Pan Subject: [PATCH net 1/2] net: delete duplicate dev_set_rx_mode() call Date: Sun, 15 Jun 2014 18:05:09 +0800 Message-Id: X-Mailer: git-send-email 1.9.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In __dev_open(), it already calls dev_set_rx_mode(). and dev_set_rx_mode() has no effect for a net device which does not have IFF_UP flag set. So the call of dev_set_rx_mode() is duplicate in __dev_change_flags(). Signed-off-by: Weiping Pan --- net/core/dev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 30eedf6..002678f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5434,9 +5434,6 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) ret = 0; if ((old_flags ^ flags) & IFF_UP) { /* Bit is different ? */ ret = ((old_flags & IFF_UP) ? __dev_close : __dev_open)(dev); - - if (!ret) - dev_set_rx_mode(dev); } if ((flags ^ dev->gflags) & IFF_PROMISC) {