From patchwork Tue Apr 24 13:18:51 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: 903444 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="uQdobdis"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkbs5WdWz9rxx for ; Tue, 24 Apr 2018 23:25:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934138AbeDXNZa (ORCPT ); Tue, 24 Apr 2018 09:25:30 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55095 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934081AbeDXNSy (ORCPT ); Tue, 24 Apr 2018 09:18:54 -0400 Received: by mail-wm0-f66.google.com with SMTP id f6so913180wmc.4; Tue, 24 Apr 2018 06:18:53 -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=7LApAivobM1uAL+Ij7aifjounGersVJkeGGRgn9xlus=; b=uQdobdiskEd2ecbEUWw6XHrJDWhALwgc+nC435kBPv8R53qwnRV6X9P1tfFwZm6dKE inQiLZdJ0HwHkWvretm0Keufgcy+zTemSIsn4IChIBYo3GEvrLN4OaDWxmgrmzC+bAxh mLXgFkPvXV/goeySsQE/1FWs2my4/U0rV3Doeo2tqdceq470p2jGPju9E42u8cYqXQbV 5iXaMDaYoBKdaBcv1vk++zlX4A1WEh4Z/pRt+DpCr2kwF7BXqb8Uhe5LHgMqUNiFiDvH EjZzj+2wpbI3wrye0KD6HARRRXrnfnMjtDMyJ/ZewhaCtZ1o7BOijR7P+M6059H0CX9V zq5w== 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=7LApAivobM1uAL+Ij7aifjounGersVJkeGGRgn9xlus=; b=Yer+4hNGNTuExFiKjSwSyGtI2XNFCNFJj9Qwg4iGMKe/MX1Oa3bEULqNnkwPrujKuk rcrDBw5EvMYbE07BcIERG/Ba7CjgAn2R1iQHw6ffAT9b00iDpLiAOR5nqaz4fSRPKcMK SQM9LwTsTa/8gML17r+FQgqzvgOOzr2GKI7MdQve2nhRYnOAyn8XAfqRcYRC7PCAwsHk cW9flnt/vvpodiIJV0t2pgbuzPHuYR9uemQK4+EXr2TKkfVgmc/NsCREOwEw+a4JJwEM U6ZDn+tjLJJrrGBd8zCkPEDqDmnE6xp/kifFSLvsDQPPzPOL/Pl4oxfvDJv7rJNqJnNs ldQQ== X-Gm-Message-State: ALQs6tDcKvaEoUppfcVus1QcBpvtooqt/iLLygv3W46B2HXXZG+/6YaO C3tsIFWgnOXBjh1OPc3Vq+beXGn9YOk= X-Google-Smtp-Source: AIpwx48//MtON9RMtk/+fevlcnREUn33p7CYPNzrIsTmKE27KaaXO4ALCWLxbtv/0ps0B5eiBrvRzg== X-Received: by 10.80.164.246 with SMTP id x51mr33128493edb.247.1524575932598; Tue, 24 Apr 2018 06:18:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id w16sm9244529edl.24.2018.04.24.06.18.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:52 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Arvid Brodin , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH] net/hsr: fix hsr_dev_xmit()'s return type Date: Tue, 24 Apr 2018 15:18:51 +0200 Message-Id: <20180424131851.5568-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/hsr/hsr_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index b8cd43c9e..a067150f0 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -233,7 +233,7 @@ static netdev_features_t hsr_fix_features(struct net_device *dev, } -static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct hsr_priv *hsr = netdev_priv(dev); struct hsr_port *master;