From patchwork Wed Feb 17 11:19:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 45610 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 4242DB7D6D for ; Wed, 17 Feb 2010 22:40:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755443Ab0BQLkv (ORCPT ); Wed, 17 Feb 2010 06:40:51 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:7028 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752747Ab0BQLku (ORCPT ); Wed, 17 Feb 2010 06:40:50 -0500 X-Greylist: delayed 1269 seconds by postgrey-1.27 at vger.kernel.org; Wed, 17 Feb 2010 06:40:50 EST Received: from xemulnb.sw.ru ([10.30.3.76]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id o1HBJWAw015085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Feb 2010 14:19:34 +0300 (MSK) Message-ID: <4B7BD0C4.3090304@openvz.org> Date: Wed, 17 Feb 2010 14:19:32 +0300 From: Pavel Emelyanov User-Agent: Thunderbird 2.0.0.23 (X11/20090825) MIME-Version: 1.0 To: David Miller , Linux Netdev List Subject: [PATCH] ipmr: remove useless checks from ipmr_device_event Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The net being checked there is dev_net(dev) and thus this if is always false. Fits both net and net-next trees. Signed-off-by: Pavel Emelyanov --- -- 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/ipv4/ipmr.c b/net/ipv4/ipmr.c index 54596f7..8582e12 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1163,9 +1163,6 @@ static int ipmr_device_event(struct notifier_block *this, unsigned long event, v int ct; LIST_HEAD(list); - if (!net_eq(dev_net(dev), net)) - return NOTIFY_DONE; - if (event != NETDEV_UNREGISTER) return NOTIFY_DONE; v = &net->ipv4.vif_table[0];