From patchwork Tue Apr 24 13:17:02 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: 903474 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="A9cxKR4F"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkx42SNdz9rx7 for ; Tue, 24 Apr 2018 23:40:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933828AbeDXNRN (ORCPT ); Tue, 24 Apr 2018 09:17:13 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53337 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933817AbeDXNRH (ORCPT ); Tue, 24 Apr 2018 09:17:07 -0400 Received: by mail-wm0-f65.google.com with SMTP id 66so899420wmd.3; Tue, 24 Apr 2018 06:17:07 -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=yqtzq+NtHmvqni6SjdEuiAZDGR5IBc/Cp/YFqjBX6ss=; b=A9cxKR4FeClcBiiTpFZRtFYAdNL+ttVETVMjSIgKtVMNAOSfbldzQzX0ZUiKkBXML+ ngiDxlEcpZmUXaIY3fBi4feAD+Wuazi8cS8qWrYDvosDAjm5MrQ2W4KatSlc4dq3/l9v R6bQ5jC8mfjajF82+Vc2b+nGpo972j0+BN9SrtmBDKBsFOSAeu0jzZH3Xzv50X9jVUQH 10doKwYpT5T9DHa79il6DZ7gprFNp5YCPrDQ/vf5iG5Rl+Cvd20KPmShfIDIby3YLwXX WvJvAG2h/QT6MkJoIpf/MnXYgPLQFb1QsLhz4z6MyBc1NILIAUqEFVxUGWoTchZloJcK RJ2A== 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=yqtzq+NtHmvqni6SjdEuiAZDGR5IBc/Cp/YFqjBX6ss=; b=fzR4lvBfJH1cgJTdDiZbUpgr39BcRo7G26k99pjMj2T3QUA5u/RU6HKI8ehUw9QG2K Tu2lgtEhisVyQsmqCGWkpI+8BCGG+kXzivXBe3cXxN8j5XpQHcw+t4oBu4DWlm0VPJni V0jQ0Vj61FKKNVxRc4yc6S3+5dm94qDm00nlfzzbcfsVkIz3jK0VHKZXUhV/Rv52wSzP PLQctYrStdL9kI29UJ5qu9EG7l/GBKFcB64Ds5ytcfbGlfUr4OtVqW2cqPfIFWhaXJNv KrBq+l50nhOyzUsZToAAd9JTADGqMYRIlxaTgpKhba927J59pNsYn8Tgq7ka+GCuCQ8J oxsg== X-Gm-Message-State: ALQs6tAfSU6qOGAoWUi7rkYo+fHFYwH2IrOsJNOb47D41As1rhbBXZm8 nZxTzcM1XEgZ5fXJJwqHNyrqjX3eTgk= X-Google-Smtp-Source: AIpwx4+YURxxsY+Scr9deTSzQAteKmM/Mav1kBlw5kC9qoIL7AnAQD5JM+LQNazdrUsUpJJ6HZpDzg== X-Received: by 10.80.212.14 with SMTP id t14mr32752907edh.75.1524575826465; Tue, 24 Apr 2018 06:17:06 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id i8sm9168695edj.3.2018.04.24.06.17.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:06 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , "yuval.shaia@oracle.com" , netdev@vger.kernel.org Subject: [PATCH] net: ks8851: fix ks_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:02 +0200 Message-Id: <20180424131705.4155-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/micrel/ks8851_mll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index f3e9dd47b..a732fdeb5 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c @@ -1020,7 +1020,7 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) * spin_lock_irqsave is required because tx and rx should be mutual exclusive. * So while tx is in-progress, prevent IRQ interrupt from happenning. */ -static int ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) { int retv = NETDEV_TX_OK; struct ks_net *ks = netdev_priv(netdev);