From patchwork Tue Apr 24 13:19:02 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: 903441 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="GXvHdlB7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkZN2QzXz9s02 for ; Tue, 24 Apr 2018 23:24:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934190AbeDXNYQ (ORCPT ); Tue, 24 Apr 2018 09:24:16 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39123 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757950AbeDXNTF (ORCPT ); Tue, 24 Apr 2018 09:19:05 -0400 Received: by mail-wm0-f66.google.com with SMTP id b21so818172wme.4; Tue, 24 Apr 2018 06:19:04 -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=/Pxd97E9gvWxOy798B3p5oqgQMrOBJGICQJoyYx/bVU=; b=GXvHdlB7tVYevrBJIXl9bBxTQNSAxXy0mRXduU42dQg5xAvr0AzA0ca2Gxdv9GoI7N Sxm2sp2SS+ujV4tMN4dJUgxxaJQoa6hmVjVBXvR6tXXdwXQqDoKrqeDsAifFxQ4VTH55 20iUOa8vhEPMzb7H66Eu1Du1eBiInAOV6Iblaa5i4JfPCsa4DoqrMLjO6U/MoMZAgUo/ tjS9CgkP0GgxA2NSGcbo6/0Vpd+DbwV74l4wPEV36SVQCpVx/duhRSsZ7iPz9xIw21JC 6zt/OlTyujLn4ULlBEqDgUCJzl5Ej2+o79BIYWbQv+b7It0a7u36VFKoe/NFRmntfKw/ bttw== 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=/Pxd97E9gvWxOy798B3p5oqgQMrOBJGICQJoyYx/bVU=; b=qobUXQQ8C8B+dm5AQ626xxTZIcoo2VyGMnjCCoB7h48P/n3EB64ZMi4gONmJnsfhff xvSyilI/qiP60UeSdcujhZeh3sq7ZlEtUxWSupqGfSqNZAqhQBIzzM+8/+4vXfL6hYaE OhAHyRyOY7QKcmMURP0hahPTCHr5ZekSfJetzQe9NjkO2oMhAyJsrqpsguFaGhJOyze6 WPK5h7cquSW33kLfEzuvD6+AhWohea9OX19gEXNWMLQJDeeW7QvNv2/FBWC95T49EVzJ 4Tg/A2PamyXwO7FzeEJYnUBlxHYvH4FPwHIa4ur9y+K5AACXdcIy5mMmEwasJ1cvizQU 4C9g== X-Gm-Message-State: ALQs6tAEsjqTW8urVBIDa6/+9jbR9iyhf6CvqoSuo6kJrCLeQLxMG1aZ /hHSIyDAKF7NHTlnWzhqhDXlHghBc20= X-Google-Smtp-Source: AIpwx4/y/U93LVqzhFb/52ImXihvSJ0nXOIap3mO/uq934TeReQYh/IutlogbiikeVbaKYJGxnBx2A== X-Received: by 10.80.172.26 with SMTP id v26mr33860765edc.153.1524575943650; Tue, 24 Apr 2018 06:19:03 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id 4sm9485935edt.95.2018.04.24.06.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:19:03 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Casey Leedom , netdev@vger.kernel.org Subject: [PATCH] cxgb4vf: fix t4vf_eth_xmit()'s return type Date: Tue, 24 Apr 2018 15:19:02 +0200 Message-Id: <20180424131902.5767-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/ethernet/chelsio/cxgb4vf/adapter.h | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h index 5883f09e3..e29fc4699 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h +++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h @@ -560,7 +560,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *, unsigned int); void t4vf_free_sge_resources(struct adapter *); -int t4vf_eth_xmit(struct sk_buff *, struct net_device *); +netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *); int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *, const struct pkt_gl *); diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index dfce5df75..9ce901f49 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c @@ -1159,7 +1159,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n) * * Add a packet to an SGE Ethernet TX queue. Runs with softirqs disabled. */ -int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) { u32 wr_mid; u64 cntrl, *end;