From patchwork Tue Apr 24 13:16:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 903479 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tloBL7Ad"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkzQ5nlHz9rx7 for ; Tue, 24 Apr 2018 23:42:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933753AbeDXNQ4 (ORCPT ); Tue, 24 Apr 2018 09:16:56 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:52077 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933721AbeDXNQt (ORCPT ); Tue, 24 Apr 2018 09:16:49 -0400 Received: by mail-wm0-f65.google.com with SMTP id j4so906866wme.1; Tue, 24 Apr 2018 06:16:49 -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; bh=V20IyKKvh0O2PHi6TbYZzmhkigs2s7v+9PQJWmwAyho=; b=tloBL7AdoD7JFC6Jj+N1MHdzshqkmRrZ4xvNkEwHdd/QXYLnQflyTvsvvF+bLA54+z +FdNW1KWyJIfKggDT4fjPa3pjbHUF05/+LS17iujCZibBg8+Z5AM+ngt05NTVzmzttw9 JA5ELjxbVyY/6HOTqD4pRdXM0iI6p682Rdkt0ndWZQr01n91NHHmWp+TX7LwXIY8R5gS YFIwoLh00ZXryYd1iXmHG3h9YxecID0lCTO4uVMalHL4yOa8JGY2HIm60AIUaWrqnqlQ DTjfvtXI4DwfxXQ2vIjC/8L8Ywox4PwtQ00GI9UkSrmRyRCasCGz+6Uh1BSPcUUh+e5J EPXA== 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=V20IyKKvh0O2PHi6TbYZzmhkigs2s7v+9PQJWmwAyho=; b=lJjg5HzDIjo+PbtNjyIYTX7AcAsIYVYMLuP0FVlCA+CzdSL0hudbIjVhdfQnV0tdHg HN9xqGr7SXzR08szLwMbVgr22cKYY0CaIH47+balJNb5tRxzKrVEIiI21cukqArQtbx8 KMI13YTejNUrcv/WQrbKGjmUjohdOVbOgcbEnYbdjeQwhcRxqCcwSDlXH41gPy8Y4VSG rr0l6u4kjydlvNffE6mcphVSBWlLAysqtUqolCdIfXTYxR35HTPfwUqzqeTWKRnxVD4t EEblgx3v398herVRuG0G+OiDvWk72DfeBVQZhpiSBuUYJySL+tY9km+a9vi1zthvd38L BYMA== X-Gm-Message-State: ALQs6tA1gE2KrxMXHQKrHVF/UKDgpGt8nT//n9UsZxIc5ooYevlfnVtF Xgcw32r90cWh9ed8DUxWCxMJo7mxqFc= X-Google-Smtp-Source: AIpwx48i5Vw0DvwpsLK2DPgfco1kY+NNc892AImYTRO4pjJ1nSoRi6Bvp/KRoKQgeXi/XOEapWGzBA== X-Received: by 10.80.206.68 with SMTP id k4mr33280022edj.300.1524575808269; Tue, 24 Apr 2018 06:16:48 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id p1sm8000975edm.0.2018.04.24.06.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:47 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Yisen Zhuang , Salil Mehta , netdev@vger.kernel.org Subject: [PATCH] net: hip04: fix hip04_mac_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:46 +0200 Message-Id: <20180424131647.3905-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck --- drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index 340e28211..8acf615cd 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -422,7 +422,7 @@ static void hip04_start_tx_timer(struct hip04_priv *priv) ns, HRTIMER_MODE_REL); } -static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct hip04_priv *priv = netdev_priv(ndev); struct net_device_stats *stats = &ndev->stats; diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c index 25a6c8722..aab6fb10a 100644 --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c @@ -736,7 +736,7 @@ static int hix5hd2_fill_sg_desc(struct hix5hd2_priv *priv, return 0; } -static int hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev) { struct hix5hd2_priv *priv = netdev_priv(dev); struct hix5hd2_desc *desc;