From patchwork Tue Apr 24 13:16:00 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: 903507 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="YgGnVCfW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VlBz03cDz9s19 for ; Tue, 24 Apr 2018 23:52:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933919AbeDXNw3 (ORCPT ); Tue, 24 Apr 2018 09:52:29 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:53989 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933548AbeDXNQD (ORCPT ); Tue, 24 Apr 2018 09:16:03 -0400 Received: by mail-wm0-f67.google.com with SMTP id 66so891150wmd.3; Tue, 24 Apr 2018 06:16:03 -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=58f8JM7SkbaRR77voO4w0397HYGn8kEjKhuPPlIqzi8=; b=YgGnVCfWolsETWan12yIhQA3LneyPYA7o0BYhKcq8HiYQMZd1kb8nlIAop/X7yf3SA eOk6AbUo5Y/DhhvQ2e/4KMh8DfmeNL52ssCqVMM97+6EGxsgY7enmdIPXfAegTETfy+i wNbIS6F0F+MLnPdZ1YsD+7ZD4JVox1f1qZVaDz0hK3vKRhng7tDp/Y2h5nPwvvRPd58T x2aJSoNHk8W6IBYPAP5nnKeQROlHEurTULSsgw7N8to8Kd3QFj0erILZ6pYRS90qKZTe mmou7SBzms7eJIA1gDY1vRM+BCrdQKJhkRiJiq9+X1TSbeIDV1Lr2QXD0P5VK5qNQVCP dPxg== 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=58f8JM7SkbaRR77voO4w0397HYGn8kEjKhuPPlIqzi8=; b=RTeWurIpWjzDoYcRy/2OrNBIrfzjqQ2M5OvZ3/FZC8g2E9j88ACvzPFpZwpDL+8wBI /SBqK8r+E1CkCmVgRdOG+FbEGgYr9w7QtsDmESNKPotxUbtUqzRglqrRt9WgQT/4tKGG Tj91CYLF8r+BsJ8bFziDylAf5LJq9PUNOQYpvG3Vo0aqjNjxD+uVjwoIro+y3ERZPo2+ KH7zRhpGH9IPUSNS85Z5gsje91LDv2HfjH9N35t1JPWG2etC28BXgZ0q1EmNDn/9MfKK +rMZlCLdbBEiVe6jyMNN/u4WgQOPi6uWK6xSPQHzoxdgoOTp7pI/UElODlVGwWH1Xu3J GLUA== X-Gm-Message-State: ALQs6tAijUJMWyWEP9vw24BNp2dTvuUhu8102bxPAl1RHaFuN0u67ouG Ue0SMlvQ7hCg7Ae4wGjENVSBFvau93I= X-Google-Smtp-Source: AIpwx4/BL5+CFGt8GsRVCvWgQyw3Ewupj54Paw4HrIp6F81X2zTzXlboLzOoX7BNpyF5UG8E7PqHSg== X-Received: by 10.167.208.210 with SMTP id u18mr17900333edo.97.1524575762126; Tue, 24 Apr 2018 06:16:02 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id c5sm9595237ede.63.2018.04.24.06.16.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:01 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Dmitry Tarnyagin , netdev@vger.kernel.org Subject: [PATCH] cail-hsi: fix cfhsi_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:00 +0200 Message-Id: <20180424131600.3060-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/caif/caif_hsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 433a14b9f..a38ee7342 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1006,7 +1006,7 @@ static void cfhsi_aggregation_tout(struct timer_list *t) cfhsi_start_tx(cfhsi); } -static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) { struct cfhsi *cfhsi = NULL; int start_xfer = 0;