From patchwork Tue Mar 14 00:41:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 738501 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 3vhwvM46fZz9s75 for ; Tue, 14 Mar 2017 11:43:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Uaip1oyY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754237AbdCNAmk (ORCPT ); Mon, 13 Mar 2017 20:42:40 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:36630 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754196AbdCNAme (ORCPT ); Mon, 13 Mar 2017 20:42:34 -0400 Received: by mail-qt0-f195.google.com with SMTP id n37so8377745qtb.3; Mon, 13 Mar 2017 17:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RKb/aMpnoaV7L3Qf/x2RUhdrJvP43zeCPjZhj9HrcF0=; b=Uaip1oyYq5LMbzgMqpjcneEGrGn4KhMWXVqdEE5pUnP9e7jWC2ep7XxvPirTSdv+9E eXY+GT2/R0fRZWSHwus7AoLyJy4eluY223nW3Mn05ZKyQ1JvdX93DM18dVAP1zXIRZjr 0GZ2frwIwSbh4o3UoeuObvCzFjR8+vWL4UOKAH0ELAEKYaWRfRUVOqq1mcGQiJNS71Gu ED29hRvanhc5LjT5UqiaTUfzfuq4v5S4aC8gsTlB/Bt9/r0+6SvKhc81CGiIokIJ41MC A19sQRirk9Kb5CsomRS91H859Go3SNBqve0jGd1j3FnS0ZKz9Po5EzlTitktH8S2HQTL /t8A== 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=RKb/aMpnoaV7L3Qf/x2RUhdrJvP43zeCPjZhj9HrcF0=; b=IO7kkvp0qODurNyCBLm4DuyTFAUzUAUSq6BsxJ++KenbPNO0fF0CAtkQ06iDyfg5bW Cbck9HygXFh4ql/3lOKxYYcSgVAlrykSfpbM1Gi/NtStVQQowDx9Bxf/Fi2hAh53BGTh YiezpADenbWq9NBLZWSx2JYGDGD2r1w7oh+rAmqFBNrVML9MRmBwElPpxheSwEYtsbPx Xw1ub+rcNFau6PQjjeNWvCesBWDfJu0/5yAhuNyABZa3lpDnQkVul7kazH/zJkQvgfTF W6fzDgEulPk6qPUSqOzeIgd9PYGZiov5BH0U7i8Df5tjbqIWrJZ3RZySegB4S/ypaXKM a9Xw== X-Gm-Message-State: AMke39nFTRdsSXV4a2hmumKV1nIe1gvVRJTMdhco9+o6gy2Yd8xdqO7RIKnSLKYwZ3LGeA== X-Received: by 10.200.55.55 with SMTP id o52mr35040196qtb.279.1489452142388; Mon, 13 Mar 2017 17:42:22 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id y52sm13353343qty.60.2017.03.13.17.42.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 17:42:21 -0700 (PDT) From: Doug Berger To: f.fainelli@gmail.com Cc: robh+dt@kernel.org, mark.rutland@arm.com, davem@davemloft.net, rafal@milecki.pl, xow@google.com, joel@jms.id.au, jon.mason@broadcom.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, pgynther@google.com, jaedon.shin@gmail.com, Doug Berger Subject: [PATCH net-next 09/12] net: bcmgenet: return EOPNOTSUPP for unknown ioctl commands Date: Mon, 13 Mar 2017 17:41:39 -0700 Message-Id: <20170314004142.4746-10-opendmb@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170314004142.4746-1-opendmb@gmail.com> References: <20170314004142.4746-1-opendmb@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit changes the ioctl handling behavior to return the EOPNOTSUPP error code instead of the EINVAL error code when an unknown ioctl command value is detected. It also removes some redundant parsing of the ioctl command value and allows the SIOCSHWTSTAMP value to be handled. Signed-off-by: Doug Berger Reviewed-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index d90d366b286f..3b49c14128e2 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1062,27 +1062,14 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, static int bcmgenet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct bcmgenet_priv *priv = netdev_priv(dev); - int val = 0; if (!netif_running(dev)) return -EINVAL; - switch (cmd) { - case SIOCGMIIPHY: - case SIOCGMIIREG: - case SIOCSMIIREG: - if (!priv->phydev) - val = -ENODEV; - else - val = phy_mii_ioctl(priv->phydev, rq, cmd); - break; - - default: - val = -EINVAL; - break; - } + if (!priv->phydev) + return -ENODEV; - return val; + return phy_mii_ioctl(priv->phydev, rq, cmd); } static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,