From patchwork Tue Apr 24 13:16:09 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: 903502 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="rE8IsT1V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl9C3fVtz9s1b for ; Tue, 24 Apr 2018 23:51:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933714AbeDXNvB (ORCPT ); Tue, 24 Apr 2018 09:51:01 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54278 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933623AbeDXNQM (ORCPT ); Tue, 24 Apr 2018 09:16:12 -0400 Received: by mail-wm0-f65.google.com with SMTP id f6so893907wmc.4; Tue, 24 Apr 2018 06:16:11 -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=eWwCBQ82pXf/9RG5NjSPQhdJldJgenlVNQeiKq1jlfc=; b=rE8IsT1VC2EJyJBIwNdqwrjRh+6sH3CIqhK4Hae+0/MmKqL4gA/RQf+PSZwZFH0yhV gnrJAojqiF70LcMzQp4Ps6is+FPMaC4fEKh+63rL8ioYtOrjyZQYFK1iaxOAiLQHpT5Y Z45LDO5Q33zrN3PJs6yZB6pzLS91jJbY/MfF8ZFO95uBc+dntrY4XyT41EvaCqZ2bq0b sywROZnDYBYoTrgI6POlg1X1af5JR6sWmJldHyrlQklC3MZbKtYUsdbWJy6D/Wla8BRZ 0GBQGq8l7uqzAwu0XFSXKq2PqNkHcqKbNnBSUHfy38unxFJRA6fCEIKHcdZa/LryobJM L9yw== 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=eWwCBQ82pXf/9RG5NjSPQhdJldJgenlVNQeiKq1jlfc=; b=XECife/LQNqUolWsG5cgHyBoyKi18XbMc9djvgHuOHHOT5gYzrFaLKPGVWPusahQ5q 7bI7g7/FtAd1ItC4dMWirzwS84Kjw+sqPaiQzYnEG1qb6p6sjMAohzDifeYKxoarKd/Q P5bkpaJORXGvVKYCqpQBjbAclef3x7Kgzo60RZN5nx8QIEXSmgTmZA53ePxBtw1yb5YS yoW2/ShPvQqUoyJJuDM+Qj9JhJWNdBJyanInkdRrQPBwOkp9se69LCjEOEkwYiN7MRj/ g+lgtWQp0/O5BRKfTH4Jk5cIHOA3NkPK/6wLFwML7p1FFpNzMINW+d5Xvx9Onj8AbI26 ABNg== X-Gm-Message-State: ALQs6tCyXCs0HzAd1Ey5tL/917nSuou8UlBmtACzcnAcWOVBb/EUAfWA tdGwwkcnHJFp40VQsG2vBK3WOgvQe30= X-Google-Smtp-Source: AIpwx4/nhrEVOlo8VrfD39bnnU9AHzmO892G4EhM4wylV8yYrEqOH0pHCJ0Ao1DPP8+Z6sOkOfALMQ== X-Received: by 10.80.170.135 with SMTP id q7mr33209039edc.124.1524575770592; Tue, 24 Apr 2018 06:16:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id n8sm9254408edb.5.2018.04.24.06.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:10 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Wolfgang Grandegger , Marc Kleine-Budde , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] can: janz-ican3: fix ican3_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:09 +0200 Message-Id: <20180424131609.3258-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/can/janz-ican3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index adfdb66a4..02042cb09 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1684,7 +1684,7 @@ static int ican3_stop(struct net_device *ndev) return 0; } -static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t ican3_xmit(struct sk_buff *skb, struct net_device *ndev) { struct ican3_dev *mod = netdev_priv(ndev); struct can_frame *cf = (struct can_frame *)skb->data;