From patchwork Tue Apr 24 13:16: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: 903477 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="ntf77BB9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkyq2yZ1z9rx7 for ; Tue, 24 Apr 2018 23:42:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934514AbeDXNl5 (ORCPT ); Tue, 24 Apr 2018 09:41:57 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51146 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933763AbeDXNQ7 (ORCPT ); Tue, 24 Apr 2018 09:16:59 -0400 Received: by mail-wm0-f67.google.com with SMTP id t67so906941wmt.0; Tue, 24 Apr 2018 06:16: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=TpeZBYuL6qKWmB7FLZ9gj56cEWuDg65HsdC5dw4BKeY=; b=ntf77BB9IbDGH+XqpVLqCQvSKxc1QJPM0wMk3dVhuADV/SBCbXVWxz87FO9/BEiiY+ JTMRq5PLR+ZTpwH7t3tvCdi1EKIxCYtw8H4Hy2NwGLW75SLTQjBxNBDFCmN/GdmytyFb 7La8tMM4pLlvipqiTTfL2IoOmJtjU6hwqDxwNsswZPypcXVw6Tn04C1pW7zWeJddOFEm IC0WM7+3akAd9LVfmns2tqJGd31SZk356dMWlcpLZUZ3SO54GefJA9mtvkwtLBKIslsb cbKwZFnpBngalUDRMoY15R5i5XsnuVd78PKPq16dulpcBP+mBWV9j+Z85safiXcwZI5c IOZQ== 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=TpeZBYuL6qKWmB7FLZ9gj56cEWuDg65HsdC5dw4BKeY=; b=GjObNV5o+09TOxu46TWQE4XXRulaqE65x4BM8kCYSLZHw8CzHogclOdAPw5h6zS99d RjfQgR0Th8Vny+jW+KP9lcit9WLFh1PW35wOZ4Ta8X5qO45Z2JEr8sarlUnFwVLivtCk VwaOwyxSBVI4aTaiyhmFZPJx7ITiwMghQbSmsuP0SF+s2JyG+rKu1wFUidZgKQx7iBcy npEOwfoIK5MRAAxVmohwcL5JcJPkLC6cwg68s1fA5eu2M06dasvqmPpZTg/K/ZZS0S0l pFAN1+/9/dBJIiXfDhWvWNjsWTYFyis1i0vCZLfrFrj8akG7VGbQqVrJB9fKgTjybpml pjHQ== X-Gm-Message-State: ALQs6tDkLgJWfmeHVNJjb7pobfjEx6pifQWlzBZZnB3ysU+ulHVt1dcH OVQhmzWcFFo3qZcSDIyHu5cuSBHt/Uw= X-Google-Smtp-Source: AIpwx49KwAVxX8u3JGP4ynbYWl9miqyqHZlPBL+16HR6J7kE9eoWUsNRggijHThQvCK7MHXT608oKQ== X-Received: by 10.80.228.8 with SMTP id d8mr33306063edm.82.1524575817803; Tue, 24 Apr 2018 06:16:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id p5sm8195176edh.7.2018.04.24.06.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:57 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , Antoine Tenart , Thomas Petazzoni , Maxime Chevallier , Yan Markman , Stefan Chulski , Miquel Raynal , Marcin Wojtas , netdev@vger.kernel.org Subject: [PATCH] net: mvpp2: fix mvpp2_tx()'s return type Date: Tue, 24 Apr 2018 15:16:53 +0200 Message-Id: <20180424131656.4054-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 Acked-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvpp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 54a038943..355910345 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -6926,7 +6926,7 @@ static int mvpp2_tx_tso(struct sk_buff *skb, struct net_device *dev, } /* Main tx processing */ -static int mvpp2_tx(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t mvpp2_tx(struct sk_buff *skb, struct net_device *dev) { struct mvpp2_port *port = netdev_priv(dev); struct mvpp2_tx_queue *txq, *aggr_txq;