From patchwork Fri Apr 7 21:25:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 748468 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 3w0CLR2VDNz9s7t for ; Sat, 8 Apr 2017 07:26:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="MWrqehs9"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933997AbdDGV0C (ORCPT ); Fri, 7 Apr 2017 17:26:02 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:34597 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933491AbdDGVZv (ORCPT ); Fri, 7 Apr 2017 17:25:51 -0400 Received: by mail-pg0-f47.google.com with SMTP id 21so77252489pgg.1 for ; Fri, 07 Apr 2017 14:25:51 -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:in-reply-to:references; bh=v0ENzZndbvO7NfqzioLXek4FpoZJAsDHaJw4g3nlr5Q=; b=MWrqehs9ZWRAvfSPsebRCCwROo5a8SuoTHQBZrunzkeA5SLJqIaW89FJ+0VLj87yJU exu3WY5tZsYDY/xSReiG/G4joMoDtJXIfsPTn5IEWF0kwrckO17Qq5XY9ACXSlPn3cVk UJDT1i48qAzP8scgfm8qLj7HA9EHYWwXdo1rM= 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:in-reply-to :references; bh=v0ENzZndbvO7NfqzioLXek4FpoZJAsDHaJw4g3nlr5Q=; b=aSAK5dhhhNlsbjChBZXymvQb9FJBL6Ft3RwKPzXlg2PNLAUH3YKehZeOyYuP1rQ1rN GSwy0THnRGPidiRMJzUarf8O8loGiuF55HjV47cdls3djGXIEYFn9+4FEnzkD2a9F/Zq FIjQhp80lzRDeEd5CfdtVzDarfTpY10O3+rzYCbzAa1sJdkTx+zwsuWG0wAHqFHuAS5b EutKtkkcC+JVROt/empn4w1tMlcjFZeCaANwxY8+790vCuAu73NA3mxaQoxb5VZA3vKN iu/WORwYaVk33islS2cde3gxgl2C8wpSIYtupMgC9DT9yaXqIaEo7CwWnZxHBgvkGybC TYaw== X-Gm-Message-State: AFeK/H1DlZ4QztWlfS7gBT0zlOFYbpUeCGAf/vQOSZYicDPFZ5ro/mz+My3TkSPRMhtXpGsP X-Received: by 10.84.230.129 with SMTP id e1mr52161838plk.66.1491600350238; Fri, 07 Apr 2017 14:25:50 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id t15sm11274422pfl.25.2017.04.07.14.25.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 14:25:49 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: vyasevic@redhat.com, davem@davemloft.net, David Ahern Subject: [PATCH net-next 6/8] rtnetlink: Do not generate notifications for PRECHANGEUPPER event Date: Fri, 7 Apr 2017 14:25:38 -0700 Message-Id: <1491600340-8359-7-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1491600340-8359-1-git-send-email-dsa@cumulusnetworks.com> References: <1491600340-8359-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org PRECHANGEUPPER is an internal event; do not generate userspace notifications. Signed-off-by: David Ahern --- include/uapi/linux/if_link.h | 1 - net/core/rtnetlink.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index a500a12d0131..4fa3bf3eb21d 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -909,7 +909,6 @@ enum { IFLA_EVENT_NOTIFY_PEERS, IFLA_EVENT_CHANGE_UPPER, IFLA_EVENT_RESEND_IGMP, - IFLA_EVENT_PRE_CHANGE_UPPER, IFLA_EVENT_CHANGE_LOWER_STATE, IFLA_EVENT_CHANGE_TX_QUEUE_LEN, }; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 702723c5db58..e2b0ec5174e7 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1303,9 +1303,6 @@ static int rtnl_fill_link_event(struct sk_buff *skb, unsigned long event) case NETDEV_RESEND_IGMP: rtnl_event = IFLA_EVENT_RESEND_IGMP; break; - case NETDEV_PRECHANGEUPPER: - rtnl_event = IFLA_EVENT_PRE_CHANGE_UPPER; - break; case NETDEV_CHANGELOWERSTATE: rtnl_event = IFLA_EVENT_CHANGE_LOWER_STATE; break; @@ -4179,7 +4176,6 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi case NETDEV_NOTIFY_PEERS: case NETDEV_CHANGEUPPER: case NETDEV_RESEND_IGMP: - case NETDEV_PRECHANGEUPPER: case NETDEV_CHANGELOWERSTATE: case NETDEV_CHANGE_TX_QUEUE_LEN: rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, event, GFP_KERNEL);