From patchwork Tue Apr 24 13:16:34 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: 903483 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="cUDmOUFe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl0x2gwRz9s19 for ; Tue, 24 Apr 2018 23:44:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933848AbeDXNns (ORCPT ); Tue, 24 Apr 2018 09:43:48 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:56265 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933710AbeDXNQi (ORCPT ); Tue, 24 Apr 2018 09:16:38 -0400 Received: by mail-wm0-f68.google.com with SMTP id a8so903746wmg.5; Tue, 24 Apr 2018 06:16:37 -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=kgNqfwSLaUT1yie7UosXeInme9RjaQ+aXgMzSFUdllk=; b=cUDmOUFe8ed4nFH8HDaKNstYIqku6QfAlU/e5vuFJwybDlbsnP72Ce0FllQ8MIoh3X Ld9XTmAV2G6/KzkNTE2HidNp8wuYqIdtp8gZ7zvazvCnkawfR82UU8viNJJ9ZOMYs5Ob m2TnHasuRknDifFPX9dVDE9PC41GLOJu2guGP3OWbf/j7D9P/Kn3Afo+YQSpPAe93Kx7 i8FmKBju+b7fYv7aA3D47oJ7Wxcr+XI+vmE0gxxqx+/ijX3S8u9v/OryvdQ3HwneW+AU MNHE+M1CT0U2/8FWerCddx8SyoGwvG87R9F/lBHpZ7LzvLr4kSn6Gpzxr8WZum/jnVYF N0sQ== 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=kgNqfwSLaUT1yie7UosXeInme9RjaQ+aXgMzSFUdllk=; b=HC0zDq1StLScxutoXy4EfrH9Fg7KdE65E9ju4NQrkGK61HRLoy+tS9Z23t8d7VHKdx HCtM+QY5YqkFSWbYAXut+tF3Hf/4MZgKo23GQSuVZLvua2DIf9C2wdTsNiMcig2YX6En uipS//t1KlsMigGYXosdbt+IoRk3whgWlnTWQA3/8qvZFhsvAUxCWSimx5IGV6HeXg8d ASt2yoB5D6ovYGQ1kRutpgOUIziuZFcTXYvJq/Ru7QtR5S3hMml25zx/JbI+fvl87lCn JNVeyOqYLNEuLgHSZQsvkwm//+I6C0IbEEeQV5MViKdJmpIM6JX60tzvMSc2hKZunTan DeBQ== X-Gm-Message-State: ALQs6tDwYnYHy3t5/hW0H+FHsJEcEAX9jDkunHt0ZN0sm2woypbJPIE5 vgFj6ozor8LjMnNrtrNhEhQ0uuc2ZOw= X-Google-Smtp-Source: AIpwx4+/taPkKrXy4d6elPpQU3dXqVbsgWvdPSXxZ4zTzpbm+uh/ZNd/zN2+mdVkmvWfPQxh2gTBwQ== X-Received: by 10.80.157.9 with SMTP id v9mr29324490ede.234.1524575796466; Tue, 24 Apr 2018 06:16:36 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id i8sm9168060edj.3.2018.04.24.06.16.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:35 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Nicolas Ferre , netdev@vger.kernel.org Subject: [PATCH] net: macb: fix macb_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:34 +0200 Message-Id: <20180424131635.3658-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/cadence/macb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index b4c926810..daadda57a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1657,7 +1657,7 @@ static inline int macb_clear_csum(struct sk_buff *skb) return 0; } -static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev) { u16 queue_index = skb_get_queue_mapping(skb); struct macb *bp = netdev_priv(dev); @@ -3553,7 +3553,7 @@ static int at91ether_close(struct net_device *dev) } /* Transmit packet */ -static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct macb *lp = netdev_priv(dev);