From patchwork Tue Apr 24 13:16:30 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: 903484 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="Jezx+liT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl1M6Fzvz9s02 for ; Tue, 24 Apr 2018 23:44:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933874AbeDXNoL (ORCPT ); Tue, 24 Apr 2018 09:44:11 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:51013 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933683AbeDXNQg (ORCPT ); Tue, 24 Apr 2018 09:16:36 -0400 Received: by mail-wm0-f68.google.com with SMTP id t67so903923wmt.0; Tue, 24 Apr 2018 06:16:35 -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=avoQZPUUfvfQSprShcRRbMKntb3WoSmtnmMWC6exNUI=; b=Jezx+liTmjrsBckMgan1+gWzghcrzlPJl2SPXTfv8xCzWSMtqVMbHmgwoSwjkwFiLS uvxNoEeYdANUgFy9bawo1StMPhuCbD26zbJZBQj7yBbrK7WXRhVXo/3LkVBt+Knz45Eu f15Xmj/FJkDHRNFoWIXY7UDoNqCr2ku7byYrQGa1B8Ve7vJPMwhegJhalRaslhW9xLzf tCdoy+9pflbLybj7RIJ3WSDJEt8rT29LfW/HY6vFKRAGFpZCMnJBAbfLCPuip6QrfNbk 2spE3YRozIgcvvX1nXB4GtqCwjxPFqUd/6NcrcrxysodTpgpKCtrSEuiqxrmrNhbMxE/ j7uw== 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=avoQZPUUfvfQSprShcRRbMKntb3WoSmtnmMWC6exNUI=; b=mrgU9L8rV+NBxwLvLUmovYO38RFSQGSnoHlyJ/rK0Unp32BFjJCbUZ+QBhqFDb/X6h c26glKm38/K+otOnRseri4nsnMUbPFnqMUTMZFEQZ1CaaYG8tAhJyiiQbmQIVh+m/ifJ OqMvDEnWMZCwBORCrywV7OsvO4w7qc6YB5BAO/BnEaJ5OhXD8CclJD8mmOM7MpZOmpb7 j7WO/Sfd6Kl6W8MDCfQo3sUqESV/JpCZH4e82a5ftH5tkah4sgauILuCCjQ5j7zZI7SO opstYzYmqH7fMQwCXIGccAc4q3FBudziINjoJhlITUaTBUH0yqFNXONZhrOB9aoBy08Q +Gtw== X-Gm-Message-State: ALQs6tDJVvWTtSiidaZCoYZpQUpATLUCxgsZenTRQ4Sf5lf1Hw7fkSuH eJpfcKxg8BTED/ZXnoJGmlbcyBhUpy4= X-Google-Smtp-Source: AB8JxZrRpFlg8rvb7Q2flhPjWxoS/3BL9tEzmFcO8oREA4GFgcdmRQzkxqnDpYl5xgmvnUe6ixabDw== X-Received: by 10.167.199.2 with SMTP id i2mr5896207edq.144.1524575794129; Tue, 24 Apr 2018 06:16:34 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id z4sm9483933edm.44.2018.04.24.06.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:33 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , Johannes Berg , Marc Gonzalez , Stephen Hemminger , netdev@vger.kernel.org Subject: [PATCH] net: nb8800: fix nb8800_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:30 +0200 Message-Id: <20180424131632.3607-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/aurora/nb8800.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index e94159507..e4331168f 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -396,7 +396,7 @@ static void nb8800_tx_dma_start_irq(struct net_device *dev) spin_unlock(&priv->tx_lock); } -static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t nb8800_xmit(struct sk_buff *skb, struct net_device *dev) { struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_tx_desc *txd;