From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21734C282CB for ; Fri, 8 Feb 2019 09:14:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8C9121919 for ; Fri, 8 Feb 2019 09:14:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="mjB7pPqT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727554AbfBHJOa (ORCPT ); Fri, 8 Feb 2019 04:14:30 -0500 Received: from smtp.broadcom.com ([192.19.211.62]:41854 "EHLO relay.smtp.broadcom.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1727169AbfBHJO1 (ORCPT ); Fri, 8 Feb 2019 04:14:27 -0500 Received: from dhcp-10-123-64-227.dhcp.broadcom.net (dhcp-10-123-64-227.dhcp.broadcom.net [10.123.64.227]) by relay.smtp.broadcom.com (Postfix) with ESMTP id 91A3428F64B; Fri, 8 Feb 2019 01:14:23 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com 91A3428F64B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1549617263; bh=1Rtct+cwV7EpSz675ETCsFHfUQ7yH3pJIpf/GjpyzrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mjB7pPqTr+5jKOZ38YNOZtzWpLSZ3H4JqbsqevMd0D73gE+GX8hb4/gIjc/3PcSfl ikz1OonIvW1KQT0iFtMHwJeWMC+uN/QoKeDgfuvcdZ+rcVwD5EGaGjA1ld2EZX3xtX yY1XyFjTwnUoHkHiu96oBQKQtVbX0r6Lq8CGHRzM= From: Vasundhara Volam To: davem@davemloft.net Cc: michael.chan@broadcom.com, jiri@mellanox.com, netdev@vger.kernel.org Subject: [PATCH net-next 1/2] Revert "devlink: Add a generic wake_on_lan port parameter" Date: Fri, 8 Feb 2019 14:43:09 +0530 Message-Id: <1549617190-387130-2-git-send-email-vasundhara-v.volam@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549617190-387130-1-git-send-email-vasundhara-v.volam@broadcom.com> References: <1549617190-387130-1-git-send-email-vasundhara-v.volam@broadcom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit b639583f9e36d044ac1b13090ae812266992cbac. As per discussion with Jakub Kicinski and Michal Kubecek, this will be better addressed by soon-too-come ethtool netlink API with additional indication that given configuration request is supposed to be persisted. Cc: Jiri Pirko Cc: Michal Kubecek Suggested-by: Jakub Kicinski Signed-off-by: Vasundhara Volam --- include/net/devlink.h | 8 -------- net/core/devlink.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index c12ad6e..1dfdd81 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -369,17 +369,12 @@ enum devlink_param_generic_id { DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX, DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN, DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY, - DEVLINK_PARAM_GENERIC_ID_WOL, /* add new param generic ids above here*/ __DEVLINK_PARAM_GENERIC_ID_MAX, DEVLINK_PARAM_GENERIC_ID_MAX = __DEVLINK_PARAM_GENERIC_ID_MAX - 1, }; -enum devlink_param_wol_types { - DEVLINK_PARAM_WAKE_MAGIC = (1 << 0), -}; - #define DEVLINK_PARAM_GENERIC_INT_ERR_RESET_NAME "internal_error_reset" #define DEVLINK_PARAM_GENERIC_INT_ERR_RESET_TYPE DEVLINK_PARAM_TYPE_BOOL @@ -404,9 +399,6 @@ enum devlink_param_wol_types { #define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME "fw_load_policy" #define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE DEVLINK_PARAM_TYPE_U8 -#define DEVLINK_PARAM_GENERIC_WOL_NAME "wake_on_lan" -#define DEVLINK_PARAM_GENERIC_WOL_TYPE DEVLINK_PARAM_TYPE_U8 - #define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \ { \ .id = DEVLINK_PARAM_GENERIC_ID_##_id, \ diff --git a/net/core/devlink.c b/net/core/devlink.c index 7fbdba5..f064ad3 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2701,11 +2701,6 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info) .name = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME, .type = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE, }, - { - .id = DEVLINK_PARAM_GENERIC_ID_WOL, - .name = DEVLINK_PARAM_GENERIC_WOL_NAME, - .type = DEVLINK_PARAM_GENERIC_WOL_TYPE, - }, }; static int devlink_param_generic_verify(const struct devlink_param *param) -- 1.8.3.1