From patchwork Tue Apr 24 13:17:16 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: 903471 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="gtqJM43A"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkw74ddjz9ryr for ; Tue, 24 Apr 2018 23:39:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933869AbeDXNR1 (ORCPT ); Tue, 24 Apr 2018 09:17:27 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:39714 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933374AbeDXNRT (ORCPT ); Tue, 24 Apr 2018 09:17:19 -0400 Received: by mail-wm0-f67.google.com with SMTP id b21so807193wme.4; Tue, 24 Apr 2018 06:17:18 -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=KBKXIwkSW8hG4QgcPJOc+ywNnsPaCGw492SQ8YyybKI=; b=gtqJM43AZac7qknCSv30L0xX4hwhDsy5PYQ6p1zRF8VcpVF0f4634XVEbiwNyo3AEK 0Cu/kaRFLvhzaW85Tg9RzLIV8jRweV1ijM+qHDAmNi1WgoZ8qrZS1wYTiNevps1SeUg2 FV3u+f0cCh7x1YXy2vgUC8O6ENXwI8jRuQMMrK+JtujRDkHVd29nemYkfwuI4BgHfnOR fJIk8oLSNTUZrAda2io48q1potYNG463WBCwOLqN2W+QtftmrjsHdxteDSIFG+jC1jYI ok/2QUs396yDoel1BVMQd1fGicpP3snXJwexTgZhuYmS1URpXGi6TW0pV7ftF60pBUmr SoKw== 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=KBKXIwkSW8hG4QgcPJOc+ywNnsPaCGw492SQ8YyybKI=; b=B53+6OY0hH2ROo1TPwa+ocp4xfWoLB00DKHMQrhVasmcaZerBdz6pUDLs2JnE2MLab kFqRwHADrsOD6VKeM3NUk80SnZsM4gT73LZgw7IUioU63f3z3BvieuVlZD1tBacyrzmY f+glPFOQ/vNhlW4nakQjehyr32eHGtqrXSGwU6znKKn1KEOJBpAg7myuAiYoRFEkMBT4 dKMrmBrjcOIYaBHBlM3QFwFhxj0UQ4GTqdXFWmS3ZkEjlGzM6N2HuOLT+2/hKDrkGtjp uxCglZJ7SSk8JavEYNr85SfC68P7hND/pY+3i13UaVqi3kPd+4+P78ISQSr6oAYRPagi khDg== X-Gm-Message-State: ALQs6tBBpr+ZcrvZE7VAymElNmIhCgpalVHHVBCK3QWcGbHq2fCGJ0ZF q9A+ggJ7MlxaH1GhVzUXBI58dxrLyY8= X-Google-Smtp-Source: AIpwx4+jgBYs5EgdjC1Pwe3W+OEFy0O7EUcC0Os+UyavK2AW5SjOFoHatPnInrkgj9qcx15xzLP3dw== X-Received: by 10.80.142.207 with SMTP id x15mr33759684edx.128.1524575837872; Tue, 24 Apr 2018 06:17:17 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id 4sm9483939edt.95.2018.04.24.06.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:17 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Timur Tabi , netdev@vger.kernel.org Subject: [PATCH] net: qcom/emac: fix emac_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:16 +0200 Message-Id: <20180424131716.4308-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/qualcomm/emac/emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c index 13235baf4..ed64bafc2 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac.c @@ -123,7 +123,7 @@ static int emac_napi_rtx(struct napi_struct *napi, int budget) } /* Transmit the packet */ -static int emac_start_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *netdev) { struct emac_adapter *adpt = netdev_priv(netdev);