From patchwork Tue Apr 24 13:17:53 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: 903449 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="L6Qx0vDI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkhv3CdFz9rxx for ; Tue, 24 Apr 2018 23:30:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933983AbeDXNSF (ORCPT ); Tue, 24 Apr 2018 09:18:05 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39872 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933902AbeDXNR6 (ORCPT ); Tue, 24 Apr 2018 09:17:58 -0400 Received: by mail-wm0-f65.google.com with SMTP id b21so811218wme.4; Tue, 24 Apr 2018 06:17:58 -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=NnFmwBNsg82GN3ldw987Io06NOZVL+kOGoyKwWkPRX8=; b=L6Qx0vDIWbdhJNYE67WYE3+G1tjnQpKRDoWxPwkLm55CjXxO8ugOROzrIZtjFJBBNE 2Z6+HVGZQaU3JoEPykZsut+Hn9ZazWnaQwwzayY0xZgc8xpOLwSjHzaEBrSjTQMGyuGe VN+L0/4poravuaGz1IN+idtRTqqQZA+WNuDpUGUcgnwJS1u5SZmIZsBKyEIvhwDJr5/u INWV8Tes8Y4yQcHWjiMzVMRQEMVrdqYSPVA9/AjVihH+OLksiKmSnZIKs/pVlmVDejFP iqV/Xt90O3gTr2hJ/97WaDylM6FdbzTcPcc+xg4WEwK9pT+PQOzL7dHSoW5zB5P/SGY6 C3aA== 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=NnFmwBNsg82GN3ldw987Io06NOZVL+kOGoyKwWkPRX8=; b=t2NPJFOjJVtj3Eq9Z5bkXuSgU4LQRYaEN5Y1GFZtclSnv4moogDs0QD3EcAHT7DO5v 1NkCDlaNVQmYrilHS/KOzVvquz3CQu2ODu+ZHwtM81kmvHGi3Shlw4EOenUm2tbwPwRz EIh1nF85/84/NCS92abnC/uKGyLrEGL98Qd5nS7IYIZTVD7dGoP+1uM6ZTdWi08sj0my mPPwAIb501AXB7K+6LZdRn6pN/Ksdx4zHZinSDn9e5a7tSpdXRN8yuouEEeMq0BBQvb6 oOor1YYOCohZ+kDCj7cXFr6T5h+OkkIr/qylIYyARuZgja5VzrAL6JHdfGvc0/jvy1NV ZlFQ== X-Gm-Message-State: ALQs6tBa0tuIK5XSlZsp9FvedWzLV35TnCOT4R1Df8Vr2pLcf+84TJSL 3omHGq2ezNbLb87mHIRfXZhKAyvjr1Q= X-Google-Smtp-Source: AIpwx48eYrs1yKo/aZLY/uGHCnK0BbEau1Zd28kPj12ZzE5P0ZYRrEB8zaAm5Or8C4HfBqMmESV66A== X-Received: by 10.80.169.50 with SMTP id l47mr33939755edc.106.1524575877395; Tue, 24 Apr 2018 06:17:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id f11sm8601412edf.68.2018.04.24.06.17.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:56 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "Reshetova, Elena" , "David S. Miller" , Hans Liljestrand , David Windsor , Kees Cook , netdev@vger.kernel.org Subject: [PATCH] rapidio/rionet: fix rionet_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:53 +0200 Message-Id: <20180424131756.4812-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/rionet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index e9f101c9b..8696f9376 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c @@ -170,7 +170,7 @@ static int rionet_queue_tx_msg(struct sk_buff *skb, struct net_device *ndev, return 0; } -static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) { int i; struct rionet_private *rnet = netdev_priv(ndev);