From patchwork Tue Apr 24 13:17:49 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: 903451 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="Msh6ulRV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkjJ3xNmz9s02 for ; Tue, 24 Apr 2018 23:30:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933190AbeDXNa0 (ORCPT ); Tue, 24 Apr 2018 09:30:26 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55592 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933910AbeDXNRy (ORCPT ); Tue, 24 Apr 2018 09:17:54 -0400 Received: by mail-wm0-f66.google.com with SMTP id a8so912555wmg.5; Tue, 24 Apr 2018 06:17: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=g6HX4kN7tMdo3NHQwrtJNiiUP2sBfoqS2yE8qLX9bqk=; b=Msh6ulRVLG7P1D6ioXDBhhG4XxgZiVtVCHripBYxdK3io8r6ol6bi58iP3Jj3uU59C HMcIUnwOXNTg1QUg7EUN61602bBl0uFNGIwDPeqNgLeoxrATrVJI/N05RASHn6F3zE9K mJsQSwKMs6+rDwrUpQC1f8pB9ZbzJhTHG+kguzQbuZxED5i/83USVDvMLmNvLxYGw0MS 9yfVwGbBdhtEKigaQsg8PtD5rCP6VJSeHh4rKKDmCZPKe5RucKUqCmGlZZPfQQV8+Ezp xt4k0gQsQ4qATCAds/q9hU7wczRwLsVhPM2gNfb5ODi7Jbe53WvFiAR3A1p7f01e8wrp BhJQ== 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=g6HX4kN7tMdo3NHQwrtJNiiUP2sBfoqS2yE8qLX9bqk=; b=CpLKveZO6jTWkO084IynYPu4oKjv9HSX8rfxTK+xARvHIUdwPnN60jaBi5y5pSIkCW 2D5T6zDv0hbGJTqC92no76CmVKGfqv/PepxWWfuL1WAuLEzbbRq9UUV8yC/xtvrcpeYV y6TU6Kl/X9G4ggQxovHZGsTurR/9IuSP0sb7lBvRezoncSbAYO8EGHhxVqaT+bFrUxDa 0+77O7QW/zLoH4zC9s8qWc47V5SE/bBWgJ/bWfLPD55hxu8s66dsJMJydWee0Am5WZcs XzrsrT4znlUyd4PjRfXtlBA6ftl4bZvtuc6vUCj8ZB7zO5V+kVCSdSvUAuH/umSNPe4C NZFw== X-Gm-Message-State: ALQs6tAqV8eSJzquci0i4KnjYNXVs6qMoQtyxe1ixmqp/KKcqEVIO/8M bbvjEZJQwBOjqohRI5Oq4cQ+LTPyb3A= X-Google-Smtp-Source: AIpwx4+2MQUcafQoc7h6xpjPfhgSIbZ3N1vGGBiACTVhQRZJd3gJB9dQ35FPdIsPC975jWmBl0ojHw== X-Received: by 10.80.250.129 with SMTP id w1mr18630021edr.41.1524575872782; Tue, 24 Apr 2018 06:17:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id e29sm9557403edd.45.2018.04.24.06.17.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:52 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , "Gustavo A. R. Silva" , netdev@vger.kernel.org Subject: [PATCH] net: plip: fix plip_tx_packet()'s return type Date: Tue, 24 Apr 2018 15:17:49 +0200 Message-Id: <20180424131751.4761-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/plip/plip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index feb92ecd1..0b354e65f 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c @@ -146,7 +146,7 @@ static void plip_timer_bh(struct work_struct *work); static void plip_interrupt(void *dev_id); /* Functions for DEV methods */ -static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t plip_tx_packet(struct sk_buff *skb, struct net_device *dev); static int plip_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, const void *daddr, const void *saddr, unsigned len); @@ -962,7 +962,7 @@ plip_interrupt(void *dev_id) spin_unlock_irqrestore(&nl->lock, flags); } -static int +static netdev_tx_t plip_tx_packet(struct sk_buff *skb, struct net_device *dev) { struct net_local *nl = netdev_priv(dev);