From patchwork Tue Apr 24 13:18:48 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: 903437 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="aOVVdLcY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkS600J7z9s4Z for ; Tue, 24 Apr 2018 23:19:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934119AbeDXNS7 (ORCPT ); Tue, 24 Apr 2018 09:18:59 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55846 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933838AbeDXNSv (ORCPT ); Tue, 24 Apr 2018 09:18:51 -0400 Received: by mail-wm0-f68.google.com with SMTP id a8so918961wmg.5; Tue, 24 Apr 2018 06:18:51 -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=xD93GuBMvCA4IWy1QL1kklam8aXuy/alGt6fAJ8G/78=; b=aOVVdLcY3PZV7k3I6soLLVkmBrQ9KhyNwaPOp07orCPRGn7BJbkojNUO6ZTUwhD+Wf 5seF+UIyy6N/e6XNWr9g6pO18OAZLxv/npGYr95jOoWW5KHWlQlEfSzNStyGj6RpAqv8 KSRahb09CfiKw5HeBMJvwUVEW+FSADyyhQ0EGM8qn69hfvvY+twHHgr0KlSEjGzrEd81 d3ZIU/jg/eCnEIJOEoVZa0Wgb3DfA+MsGyaM+0L+l5eWHlQq483Xo7P/Gr56VWhLT73r ojU9piBtfm7eZdPvzhlykcZpx1PvWIja5FOgmvyTZ7659KcG+hFz9qZAlNGd4HVbed5r 3efw== 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=xD93GuBMvCA4IWy1QL1kklam8aXuy/alGt6fAJ8G/78=; b=XGYCsdmjQo+fU42oOz2KPg6ZtAYfggXISyu4uWykX+nKCZ9eN6A+ALiup3weAhvQ1K +7HXDGnNSLhOPKeSma7oT53OesFKNmf2vgvdTR8T+yy9UK7Rr2QDtFg3w2EcQyHGOhKv Uoyu+3HYw35pgtOvK5pLakMWAkUQ7YUM96RQ/lPVdHd4j+m/RoKM0ZgCGJ/bk5OxhOsP TTtAnEoKZ9e1lHi+J+FwwFtq6GBTeU6vd36+9XNiOcTW2N14HemYGPIhIPMxyqmrDCCO WpeuT+PpNcx2UNGNR+JXUF7vOWiWlNKQKj2aodOoYIdsHKgq/df1k87aTQK3490CNpTf 9LuA== X-Gm-Message-State: ALQs6tDqX7ystnnZBFSFtUwsZTiPtf6p3quVSA+jqGnM1CiVTEVkOZ/e A9MMA+Z015HYOJgXFcJrOtPvukLzSF8= X-Google-Smtp-Source: AIpwx4+oHoJtFmyiibjjdXqYeF6BRVWNOOojQt0CoDEL4YxsbOwlbJyq1edVOk9mT9TtONvYG65UYA== X-Received: by 10.80.231.13 with SMTP id a13mr32892858edn.212.1524575930367; Tue, 24 Apr 2018 06:18:50 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id i6sm8789229edk.23.2018.04.24.06.18.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:49 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Dmitry Tarnyagin , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH] net: caif: fix chnl_net_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:18:48 +0200 Message-Id: <20180424131849.5519-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 --- net/caif/chnl_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 53ecda10b..d9712247f 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -211,7 +211,7 @@ static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow, } } -static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct chnl_net *priv; struct cfpkt *pkt = NULL;