From patchwork Tue Apr 24 13:16:07 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: 903432 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="W86+DTO2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkP04V0wz9s1b for ; Tue, 24 Apr 2018 23:16:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933652AbeDXNQQ (ORCPT ); Tue, 24 Apr 2018 09:16:16 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36696 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933613AbeDXNQK (ORCPT ); Tue, 24 Apr 2018 09:16:10 -0400 Received: by mail-wm0-f65.google.com with SMTP id n10so794205wmc.1; Tue, 24 Apr 2018 06:16:09 -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=qOVhQ7jq6tgmCv3djsMQFgo4taQp1JtvJAPD950XarY=; b=W86+DTO2E8kGyx7hclyIqQc9ptKSv4RIORR15N/3JkXGmsURD7+jyx+9M27EHpbBA0 li/rtukj5FLxfD/dOBs/h+K8/B+OHq+FPFoFDbU6qQny0h3CwB7hMo7qYV0d8mU98wa3 eRllrYQuMwiIobYnEdIgpZLmc6W8S8OJUy1gFxxQeg2dDtf+7p9dynf/f7BR4oSuAQgP iDFtvXSSVDIa5VOmgeSxeMHM8CNyL80KpGXyfyCgNWZcZgei3m5ULxaAw7d8R8Ja4Csl RcWtlRs6VWmW77sAhw3AXMKB0MGwKZI0CGrZ0pB7XLeSFwTj8bMRMDxIZqC606vu2qQL Ny6Q== 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=qOVhQ7jq6tgmCv3djsMQFgo4taQp1JtvJAPD950XarY=; b=PxTXQiQd6SAAo5Is1zA1iK/G/y+sC8omU6o+W0r4iGdcgqHaqlJSruAtzS92BrPgEC +ptUNhPZEaNW8tD0SqjFsqM86k7LSqlAUJtBJcbApRnpZZHrQFsPfI+Q4hfs8xhW0uKe I5UqN1hIzHhUq04+bF/gGrgfiJlrI5Hc1lruTdGtKAvY/rFgjKtasND4eXvrzCWD+A7I QtI0xWsIGWuVNOijqGUZ61BHJAAott9lA3iNBmYAuodH9H8JoYxMjLGhIAyxaTOp0/8e TCFSMd91OgsW1nWSauqoZ7x18aMYWniJKrpicFAksBC3Augfdj5KJrFEGkuAayQmylyj vxmw== X-Gm-Message-State: ALQs6tBQMGFtFcMkLWadNqu/yYCoT2QTVT81YB1wWO/4pYGpbxUE4EmB IxYmK39LqMR5veM5OSsAOXxyjkC7UI4= X-Google-Smtp-Source: AIpwx4/WgD6BJusqnO+/3r4nE3P5kc02ASNqojIwTGn8P0G4xtnRsrfm0OtnRz99tqUTALc29DXmtQ== X-Received: by 10.80.191.66 with SMTP id g2mr33141314edk.283.1524575768402; Tue, 24 Apr 2018 06:16:08 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id d9sm9070985edm.74.2018.04.24.06.16.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:07 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Dmitry Tarnyagin , netdev@vger.kernel.org Subject: [PATCH] caif-virtio: fix cfv_netdev_tx()'s return type Date: Tue, 24 Apr 2018 15:16:07 +0200 Message-Id: <20180424131607.3208-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_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index 2814e0dee..f5507dbb9 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -519,7 +519,7 @@ static struct buf_info *cfv_alloc_and_copy_to_shm(struct cfv_info *cfv, } /* Put the CAIF packet on the virtio ring and kick the receiver */ -static int cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev) { struct cfv_info *cfv = netdev_priv(netdev); struct buf_info *buf_info;