From patchwork Tue Apr 24 13:16:37 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: 903480 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="tH84SBDX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkzc35JCz9rx7 for ; Tue, 24 Apr 2018 23:42:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933733AbeDXNQr (ORCPT ); Tue, 24 Apr 2018 09:16:47 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54434 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933721AbeDXNQk (ORCPT ); Tue, 24 Apr 2018 09:16:40 -0400 Received: by mail-wm0-f65.google.com with SMTP id f6so897491wmc.4; Tue, 24 Apr 2018 06:16:39 -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=37nigXMP7MKPrSPC9HVA9P34bqmweBjXUVBy5Mk7lLc=; b=tH84SBDXqDo++FkzrxozofoTqSZ76Av16Y3Q/TauXrQ78KNJq5QgjtPCA2n55CukqI Zzsid8NqUTDRjI71pU11JgiTQVJz7/QxICstpwGAmcWbopVj/vY9/2UAu+LYN+kKayf0 ukJxEExbm+L4xOkg1/jRhvD7kyuNdrMB08LHhrXBAfsoWbLDfoZiLj6q/kaw8bEaBr13 HxUa4e7oZxIs3aFxE0VLZDDeMdpCXaMN4wdA9mrNqc81WRfbo0YvEx3NDrwv2hTsSM5l bwl6e+MSEAF6AhaUIS1gQieojENk3uR6N6l1zl0lSEdz+PjQhdgrBEZM2PcoPWGTSqhb jKNQ== 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=37nigXMP7MKPrSPC9HVA9P34bqmweBjXUVBy5Mk7lLc=; b=DXLOlgxeuWulJiOJvAeNMfIn68w18lyJea8i66SydLCq7AF1pBhjm2ZHSE0qnTXlmO pziRVMGAOt/F3oL0tLb0bbI1unE2qAEa9kfAUgD+2OuNfOxYLExCKwofUMSHktGFitSc wmwrCWVQBVf/AiADDvlzr1oQFGXfcICUQy65sqxDKsgnKDJ/9BnIoHZJ9XNIfA0muWEG OMLwyxKvrtaibCARjzO2+E/e7Qy//vulJ1oF7hZFaoJ82lp3Vjo3o4JrJBRkM/r/jEn7 1aVs/fSYFoV4l7cxTzWznsB+rg3tTb1k46/X6y/XwlspRXCRV+6t6pGcnlgWkoVSOCLO 1GVQ== X-Gm-Message-State: ALQs6tCKDqcjFtK7/IRrwVabMujQtwvm/odwiFH/k1JmaQb5PKKshpLW Wf+QqdT+tPRPAjuwD9Tepvd55aatRRU= X-Google-Smtp-Source: AIpwx4/vctWpu4pmzS0ts1VbP4fTMtjkljmxDUXALBgls0ffASkN4c4Gzu/nqe8geVLUE6YJeAhGzA== X-Received: by 10.80.174.70 with SMTP id c64mr34095772edd.166.1524575798826; Tue, 24 Apr 2018 06:16:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id c5sm9596223ede.63.2018.04.24.06.16.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:38 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi , netdev@vger.kernel.org Subject: [PATCH] liquidio: fix liquidio_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:37 +0200 Message-Id: <20180424131637.3707-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 implementations in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck Acked-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 603a144d3..6d6f16815 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2491,7 +2491,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct, * @returns whether the packet was transmitted to the device okay or not * (NETDEV_TX_OK or NETDEV_TX_BUSY) */ -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) { struct lio *lio; struct octnet_buf_free_info *finfo; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index f92dfa411..13ef46a85 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1560,7 +1560,7 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct, * @returns whether the packet was transmitted to the device okay or not * (NETDEV_TX_OK or NETDEV_TX_BUSY) */ -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) { struct octnet_buf_free_info *finfo; union octnic_cmd_setup cmdsetup;