From patchwork Tue Apr 24 13:16:39 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: 903482 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="ao99uAmF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl0Y2Vv7z9s19 for ; Tue, 24 Apr 2018 23:43:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934421AbeDXNn3 (ORCPT ); Tue, 24 Apr 2018 09:43:29 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:39557 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933702AbeDXNQm (ORCPT ); Tue, 24 Apr 2018 09:16:42 -0400 Received: by mail-wm0-f67.google.com with SMTP id b21so803486wme.4; Tue, 24 Apr 2018 06:16:42 -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=/HBdrwbmhVZ4rmfDov5s8MRXlskyKZgigSlpuU5I4gI=; b=ao99uAmFNvQHeWcbXYlYVEnP+PINvZ2Ho637yUqXpMIxoo1y23NsyDEEeOK4pBeoVB N3SGR5yExGh49iVK03ivw7zZkQ0c+OWp/AGlLtX24pEFg14680k+6s11opFUPT1PvYOD nAcr9ik9UpJYTzKcB3qCZ4zkLjCQT1GDWN/pKYD2TJH30GvOxkz6LRaitrAiRzQHEwBn GOhLnxSLFz2RH2x0pdzG5ymiyXSo8Evx5fptSm/zRfstS/VWptxEi+kWAqHgJdiRm+nz +ZpgyMvE+lk/r3my7XC/4jFDxegqptcv7Jjl7UnWRCSOTaTIz//hw2C5C9+ZX/MvAUgF SU9Q== 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=/HBdrwbmhVZ4rmfDov5s8MRXlskyKZgigSlpuU5I4gI=; b=X61bPtJhg8wibRLRtuq3hS/SfQbVDzmnhTRj8By1Kx3vt8VQ9P2KmEn7EIl3IusATA mkNoKkE+nQxhXHWy0WC3g+/jVwLryHey4cdbBprNPBE5XmuoW5kG8iGrCmaU3ABDEYDp EZf6/cFwmUf2utu9k4W7H84KdnXJ/EG8MREniSXahfIVHdnn57PmPNaGSd0LJxII0Yan C8LAYhaHe93hArJ39ECCp5X2hkssIyFmqnLtuQBRWwj5FmTqj8HcIpDHqkKa+NFtpaIT Fm+UIIALiv2Lv6hKw2WP2FxogwyMYgOC8LcLhM9lWD3gIjRCFZC4uYXb2tzOUChmDwv1 rXNg== X-Gm-Message-State: ALQs6tDzMCAXqa3yxQYn8QvSEiO2piJWo/BwfvmlCgt8YWbi8+hlpBWX aJiwyPctafcVHbQThycouoOuf6+5b8w= X-Google-Smtp-Source: AIpwx49LeIwpF3Jt+rV+kbAYXwljDBlqkOzcmVR3RXY7YKGfNh8JQGf5pg5Jnf9IzLCRnqHlJMAT3Q== X-Received: by 10.80.166.152 with SMTP id e24mr27329844edc.2.1524575801103; Tue, 24 Apr 2018 06:16:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id j17sm10546374ede.1.2018.04.24.06.16.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:40 -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 lio_vf_rep_pkt_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:39 +0200 Message-Id: <20180424131639.3757-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 Acked-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c index 2adafa366..5973a4083 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c @@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev); static int lio_vf_rep_stop(struct net_device *ndev); -static int lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); static void lio_vf_rep_tx_timeout(struct net_device *netdev); static int lio_vf_rep_phys_port_name(struct net_device *dev, char *buf, size_t len); @@ -379,7 +379,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, netif_wake_queue(ndev); } -static int +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev) { struct lio_vf_rep_desc *vf_rep = netdev_priv(ndev);