From patchwork Tue Apr 24 13:16:48 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: 903433 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="NOuQRbjz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkPm1c4bz9s25 for ; Tue, 24 Apr 2018 23:17:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933769AbeDXNQ6 (ORCPT ); Tue, 24 Apr 2018 09:16:58 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54508 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933200AbeDXNQw (ORCPT ); Tue, 24 Apr 2018 09:16:52 -0400 Received: by mail-wm0-f66.google.com with SMTP id f6so899003wmc.4; Tue, 24 Apr 2018 06:16:51 -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=qsgvXsKbfBmnSPjyn38wPF7TilCRlBd5HIjANI2zE/Q=; b=NOuQRbjzr1CVIvY2eeLNH1Rm4SC+JyxEbGbwJ07Bs8X3YpglkioIQKljQVPS7vh2YW NEKiQTxEwBV4q17B0q8y00XVrZb7Sm08Uz0S3TH0WLsWlQuxgw2Lc9yraALwgWuBaAnK 7tDJ0/dzyNz5bYnzKfz7BBNGS4FFvXXOTYSwy+M1gsWeXh5BEPLQiZgOz2pZldDVefyI 0Y72ETBxSYGQ9+9PJd6jzPB2H6x02GVZ+G/5f1iJeSfEcHZmSCq/ZjwY5atoywFoVcrd HXi+kAv9xF9tlkwQjYqFWG3/EAyqufrnyTU4ZF5Kn/C37SOT+oTlNbMorNzatg7PFD+d u38A== 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=qsgvXsKbfBmnSPjyn38wPF7TilCRlBd5HIjANI2zE/Q=; b=rZZcuFeFNWHw9bBHjsWjtvQE7c16GZtaKyy4MUVRbT8AdLLAb0D8BkB2Sddgkc2dX2 x3jaD2Xk5Dix/1fguWZt+ifCaKXmRt/zeOZ8TpL1RULvaJobfYF54fb4JXeWtrJ38BPm Yy0dYKCzL1LnC0ko2NmTZE6+UnUetWzfIdXmvnhXP71RQ8ClKg8r/b0yCpeZ316Ri5r7 bzvPJEUwYF105ro7+Q/zSlOvib9/7bXqWsJD1ReD9NvkU39fM1Jpkmx+RsJTdzJAFqwY nCuoW0oYWxCuwdUCKdNg6m1R+HzaGjUb3rm2GBhvZdBg/TRlMju+dKXphkufzOjkpImw bwuQ== X-Gm-Message-State: ALQs6tCClkhgxd8KBB8k9cJLEalhqRMwDvVgc/vjHeBofoneds2mPCIu +WKq1Itza3ZmQoMT3zUhSS/tvO5WcpU= X-Google-Smtp-Source: AIpwx49N7ZuV14uoz3KL59eDpeFBrRmN8ztQ4j/zRfIvdmI2Yh8XcG3Me9n53hf/ZhiL9VAsUFbV/A== X-Received: by 10.80.213.158 with SMTP id v30mr25721219edi.167.1524575810489; Tue, 24 Apr 2018 06:16:50 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id n3sm8963316edl.27.2018.04.24.06.16.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:50 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Jeff Kirsher , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH] net: ixgbevf: fix ixgbevf_xmit_frame()'s return type Date: Tue, 24 Apr 2018 15:16:48 +0200 Message-Id: <20180424131649.3955-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/intel/ixgbevf/ixgbevf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 3d9033f26..ce217a2e9 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -4137,7 +4137,7 @@ static int ixgbevf_xmit_frame_ring(struct sk_buff *skb, return NETDEV_TX_OK; } -static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) { struct ixgbevf_adapter *adapter = netdev_priv(netdev); struct ixgbevf_ring *tx_ring;