From patchwork Fri Apr 7 21:25:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 748469 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 3w0CLT4XB6z9s7t for ; Sat, 8 Apr 2017 07:26:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="MvViOq2I"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934024AbdDGV0H (ORCPT ); Fri, 7 Apr 2017 17:26:07 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:36787 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933390AbdDGVZw (ORCPT ); Fri, 7 Apr 2017 17:25:52 -0400 Received: by mail-pg0-f45.google.com with SMTP id g2so76021174pge.3 for ; Fri, 07 Apr 2017 14:25:52 -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=dwkZizpArqPZ7wsXQ2tc9Ll9iNWtEvsIzxOUDIggfdM=; b=MvViOq2IP3J09GW/dJAh9bapu3g1RjqKtQhVnW8yWkWKg4GXlz+azF1UNedWTb3JOI yG/fCC/F7uw3qmycu+cJ4s4U7u9X2/wc0v3Drvm64Wv64j0DCe9BkVaQ0BDUo78ZuhEo woJg1ZedgTRbyIna501go4zFGeQxFNUR5e2Nk= 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=dwkZizpArqPZ7wsXQ2tc9Ll9iNWtEvsIzxOUDIggfdM=; b=jdb+wler9SvusF4e9ilOSTY6OZO0mYA++ubReWSDo3T5iNG5Xie7+w0MXk+N/jip+F 4OIEIybvXcL0X662EOrbzESTexhM+dKLBqIzWbqPg/9amKyb5Z1bBZx4wF9g1xfu37qn 6xqqN9E5KwctQZNVVIjlWmAd4GXGW8TUXS0ovW2C+zzOkgG/VoaHdXhQVV/M361qa8vv 2/Zgoik8DlhzG+0t5HX+JY88YJL6rgod8gVa+0w4h6QwFHRyNtnY/ZyK5CB7+WhwvefZ DwOrBWaNv16aaQ92a3hIURvu3FiTYcIcXmRX2E+392yVPemgLvklwoRFg78VUHw+hU6H k8AA== X-Gm-Message-State: AFeK/H1y7sQef/+kUW1Y70VwuIFzaLd2bNaWeRBgBUB7osFQB7pcx1PiriE0zoNBt/2iGytX X-Received: by 10.98.69.86 with SMTP id s83mr41705254pfa.232.1491600346997; Fri, 07 Apr 2017 14:25:46 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 14:25:46 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: vyasevic@redhat.com, davem@davemloft.net, David Ahern Subject: [PATCH net-next 2/8] rtnetlink: Do not generate notification for UDP_TUNNEL_PUSH_INFO Date: Fri, 7 Apr 2017 14:25:34 -0700 Message-Id: <1491600340-8359-3-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 NETDEV_UDP_TUNNEL_PUSH_INFO is an internal notifier; nothing userspace can do so don't generate a netlink notification. 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 e8b7e9342cc0..064218a840b7 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -914,7 +914,6 @@ enum { IFLA_EVENT_CHANGE_INFO_DATA, IFLA_EVENT_PRE_CHANGE_UPPER, IFLA_EVENT_CHANGE_LOWER_STATE, - IFLA_EVENT_UDP_TUNNEL_PUSH_INFO, IFLA_EVENT_CHANGE_TX_QUEUE_LEN, }; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 72d365ae14b3..1a46be074fd6 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1318,9 +1318,6 @@ static int rtnl_fill_link_event(struct sk_buff *skb, unsigned long event) case NETDEV_CHANGELOWERSTATE: rtnl_event = IFLA_EVENT_CHANGE_LOWER_STATE; break; - case NETDEV_UDP_TUNNEL_PUSH_INFO: - rtnl_event = IFLA_EVENT_UDP_TUNNEL_PUSH_INFO; - break; case NETDEV_CHANGE_TX_QUEUE_LEN: rtnl_event = IFLA_EVENT_CHANGE_TX_QUEUE_LEN; break; @@ -4196,7 +4193,6 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi case NETDEV_CHANGEINFODATA: case NETDEV_PRECHANGEUPPER: case NETDEV_CHANGELOWERSTATE: - case NETDEV_UDP_TUNNEL_PUSH_INFO: case NETDEV_CHANGE_TX_QUEUE_LEN: rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, event, GFP_KERNEL); break;