From patchwork Fri Jun 11 02:12:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 55282 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 2C510B7D86 for ; Fri, 11 Jun 2010 12:12:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760046Ab0FKCMr (ORCPT ); Thu, 10 Jun 2010 22:12:47 -0400 Received: from ringil.hengli.com.au ([216.59.3.182]:38008 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754745Ab0FKCMp (ORCPT ); Thu, 10 Jun 2010 22:12:45 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1OMtjg-0006HM-0u; Fri, 11 Jun 2010 12:12:44 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1OMtjf-0006OS-P3; Fri, 11 Jun 2010 12:12:43 +1000 Subject: [PATCH 2/8] bridge: Remove redundant npinfo NULL setting References: <20100611021142.GA24490@gondor.apana.org.au> To: "Michael S. Tsirkin" , Qianfeng Zhang , "David S. Miller" , netdev@vger.kernel.org, WANG Cong , Stephen Hemminger , Matt Mackall , "Paul E. McKenney" Message-Id: From: Herbert Xu Date: Fri, 11 Jun 2010 12:12:43 +1000 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bridge: Remove redundant npinfo NULL setting Now that netpoll always zaps npinfo we no longer needs to do it in bridge. Signed-off-by: Herbert Xu --- net/bridge/br_device.c | 1 - 1 file changed, 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index eedf2c9..dce0611 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -231,7 +231,6 @@ void br_netpoll_cleanup(struct net_device *dev) struct net_bridge_port *p, *n; const struct net_device_ops *ops; - br->dev->npinfo = NULL; list_for_each_entry_safe(p, n, &br->port_list, list) { if (p->dev) { ops = p->dev->netdev_ops;