From patchwork Tue Apr 24 13:17:22 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: 903472 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="mXEogwlT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkwc1FYrz9rx7 for ; Tue, 24 Apr 2018 23:40:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934495AbeDXNkD (ORCPT ); Tue, 24 Apr 2018 09:40:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52546 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933817AbeDXNRZ (ORCPT ); Tue, 24 Apr 2018 09:17:25 -0400 Received: by mail-wm0-f67.google.com with SMTP id w195so905960wmw.2; Tue, 24 Apr 2018 06:17:25 -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=mCzNw1CzgWyYawd5BV1ejaBgN9mZZ7sraqd7EsWAEfQ=; b=mXEogwlTVZIwY7+W6QQidlWMLyAAQYkFER5yiAAjQ7A/KlH9FrwJbnEIDYu64T1m0a 0W2ISJiisEwB2oKymi9yTx8Vapq3lSi/MrkVOI/Ol6JHmasIhQWT7HFzxZe3OFiPOIdM sKiD59y4pG/BHs2zF6EpnNkcic7RGf2agWbIXY8NtRJFAAFw1opgdhd+Uz+33iBavuH7 AfTmiFh+ZD4y0sxOEfvSVO75byigt9AhTzQQO0aaFYsnj5l1qoMK60Dwpz313kpZ7y8N W0iJL7jDoKX7CgNhJLLw/Z+ZnlYeb5fqwWN6yKbH2BXstOUtb6xr6Z7QWzWuathLevSd TDpA== 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=mCzNw1CzgWyYawd5BV1ejaBgN9mZZ7sraqd7EsWAEfQ=; b=N0/aZSPzAcr35rf33/uU8k6k6s55HXipXsgR7NkFBqMvMg5UTJr6wj6wFCEJ8h7PLf imt3zgSDptFUvub9bQZ/NdUIYeHkgQaeY2QvZNf2kb97dE1hulEeDN54Eg6mcOTHExx/ Uav4JcL8LWaJW++0ii/MHVYqYascBDCxkNzi7melTfSwHQS6T3Hz+bSwgqbOCwdr2Wrn l7cvZQhEhlGeIcaAJZS9jUukwM3L6YigRwihkHhGO0Uo3UT4GbaWPgRnPmGzeqibSO/h BTwwfZIWcdU/Ol87l5Y6P5iUZJR+FodciM5OdjkxZUWAOsVwnyWJtZCEf+ddfXsf/aWU zuPQ== X-Gm-Message-State: ALQs6tDQuD25aPeYN8yoWt1981Lyk+LbvhHtmOJhUUiYhCoUBW1FTbrS JVDG9O6WpMDrfPazGrJajlL2i/tGE1k= X-Google-Smtp-Source: AIpwx4+u9BlVEaKNgorbKA1ShBYRIokZsfxO2sc38BS1luRGIzJZRk1jiP7O6opGGIoyuXz132uwKg== X-Received: by 10.80.195.89 with SMTP id q25mr29515919edb.178.1524575844338; Tue, 24 Apr 2018 06:17:24 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id i6sm8787668edk.23.2018.04.24.06.17.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:23 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Steve Glendinning , netdev@vger.kernel.org Subject: [PATCH] net: smsc911x: fix smsc911x_hard_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:22 +0200 Message-Id: <20180424131723.4408-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/smsc/smsc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index f0afb88d7..8d3e61ca8 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -1786,7 +1786,7 @@ static int smsc911x_stop(struct net_device *dev) } /* Entry point for transmitting a packet */ -static int smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct smsc911x_data *pdata = netdev_priv(dev); unsigned int freespace;