From patchwork Fri Apr 28 18:06:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 756514 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 3wF1wf5Wrlz9rxj for ; Sat, 29 Apr 2017 04:06:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Uiue1E0H"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S642283AbdD1SGk (ORCPT ); Fri, 28 Apr 2017 14:06:40 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:34919 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S642262AbdD1SGf (ORCPT ); Fri, 28 Apr 2017 14:06:35 -0400 Received: by mail-pg0-f47.google.com with SMTP id o3so13153319pgn.2 for ; Fri, 28 Apr 2017 11:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=8gvJRKk/72oQAFZypjmepcAnFfEHALB7hFSQ1y7gusQ=; b=Uiue1E0HhrfognZLIFA2WQPjpN2GwAW5Xifi0fUvCRFS2xJm8RwVNNn4DE2iEMRqHL McX6hgGhU+YsiZXpXT2H2qOIEpOyyBkSrZ+Co5Nkjm6NN19sMUJGysa6I9qBw2PpYNUm Du8PfhhiFjrqjRbUKnyM8VmlsJg0PKydmq8sM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8gvJRKk/72oQAFZypjmepcAnFfEHALB7hFSQ1y7gusQ=; b=j53Cmqqz0CXTyGhsRo4j5Rsy8nsx3HJKODca4mY73SgHpOnmhdFZJtTJc1Sl/mrs0L q9+ARXcmDSjv9GUkDSJUHb/OkO2iW4mEwfR8Z6qF46+4TChGWbxOgWUh2tfV669qhHWu QSLCOlCqxFDCo+s8YMVpbh7Jfmt9WzPROQX2Tl0d3LdK3ehbQk3aX2qlO6DPas93JA0Q h1OwLUAUpMuSInDYbMICJF3fv+z14AD5wd0uTyfmQZ8VWbVpTqKVbP6esV0kB2+1GTl7 LMzjqd0acaV9wo9l9m3GtFRePBYr3b21GAnyIoPPUKqGSIzPTq3cJ+izqpRkgS6lbEpG CkHg== X-Gm-Message-State: AN3rC/5ngkNougCS6yJf4Rk2191egw910rIhS4RGQu7kGJH4riiaMa8V qCvJ+HBfGGsCttWa X-Received: by 10.99.206.5 with SMTP id y5mr13442253pgf.212.1493402795272; Fri, 28 Apr 2017 11:06:35 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id w5sm10990225pfd.23.2017.04.28.11.06.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Apr 2017 11:06:34 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: jiri@resnulli.us, David Ahern Subject: [PATCH net-next] rtnetlink: Remove NETDEV_CHANGEINFODATA Date: Fri, 28 Apr 2017 11:06:25 -0700 Message-Id: <1493402785-18844-1-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org NETDEV_CHANGEINFODATA was added by d4261e5650004 ("bonding: create netlink event when bonding option is changed"). RTM_NEWLINK messages are already created on changelink events, so this event is just a duplicate. Remove it. Cc: Jiri Pirko Signed-off-by: David Ahern Acked-by: Jiri Pirko --- drivers/net/bonding/bond_options.c | 2 -- include/linux/netdevice.h | 11 +++++------ net/core/rtnetlink.c | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 1bcbb8913e17..533518a64496 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -673,8 +673,6 @@ int __bond_opt_set(struct bonding *bond, out: if (ret) bond_opt_error_interpret(bond, opt, ret, val); - else if (bond->dev->reg_state == NETREG_REGISTERED) - call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond->dev); return ret; } diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index cc07c3be2705..c49a7a901710 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2279,12 +2279,11 @@ struct netdev_lag_lower_state_info { #define NETDEV_CHANGEUPPER 0x0015 #define NETDEV_RESEND_IGMP 0x0016 #define NETDEV_PRECHANGEMTU 0x0017 /* notify before mtu change happened */ -#define NETDEV_CHANGEINFODATA 0x0018 -#define NETDEV_BONDING_INFO 0x0019 -#define NETDEV_PRECHANGEUPPER 0x001A -#define NETDEV_CHANGELOWERSTATE 0x001B -#define NETDEV_UDP_TUNNEL_PUSH_INFO 0x001C -#define NETDEV_CHANGE_TX_QUEUE_LEN 0x001E +#define NETDEV_BONDING_INFO 0x0018 +#define NETDEV_PRECHANGEUPPER 0x0019 +#define NETDEV_CHANGELOWERSTATE 0x001A +#define NETDEV_UDP_TUNNEL_PUSH_INFO 0x001B +#define NETDEV_CHANGE_TX_QUEUE_LEN 0x001C int register_netdevice_notifier(struct notifier_block *nb); int unregister_netdevice_notifier(struct notifier_block *nb); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 58419da7961b..1072b88e5845 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4127,7 +4127,6 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi case NETDEV_CHANGEUPPER: case NETDEV_RESEND_IGMP: case NETDEV_PRECHANGEMTU: - case NETDEV_CHANGEINFODATA: case NETDEV_PRECHANGEUPPER: case NETDEV_CHANGELOWERSTATE: case NETDEV_UDP_TUNNEL_PUSH_INFO: