From patchwork Tue Apr 24 13:18:59 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: 903438 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="PDJzudPw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkSF5DgRz9s4b for ; Tue, 24 Apr 2018 23:19:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757958AbeDXNTH (ORCPT ); Tue, 24 Apr 2018 09:19:07 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53857 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757945AbeDXNTD (ORCPT ); Tue, 24 Apr 2018 09:19:03 -0400 Received: by mail-wm0-f65.google.com with SMTP id 66so912519wmd.3; Tue, 24 Apr 2018 06:19:02 -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=7hLA6x0ogCg6V6wGw7pmt7Z41KRMtkthxE4kYGFOF5E=; b=PDJzudPwYHKeFA7rSZN1b0Lds00QKjhwdfMTPeZiaMEZmO5BlNZHS/9cwTFYcsZi2K 2pZ+jpZmBwOq5ZfAP62jHQ3ThJ88LUhBvghfn3IYIoHsswzHr9x4cKdcrAtMRo3CNQjK oWahEgzVA7H7Ei1GFVGagK7iqZ+E00KHxr3pkfXTqPc+J2/G+3T9GnmMc0neVQLCkZ5C UTXrcS4NFXVjL28pt+ICu/UZEZo8RT+5qQ8EleKUBlTJA9ZdBD1zQSiPO8JfRZMRpc4I Vi9h5gYeJHCHdWbPli2SGD+unxxvgTyqpMcOT247/z/X00pQZJCOdp6R9N2FTeWH5JVD 6hJw== 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=7hLA6x0ogCg6V6wGw7pmt7Z41KRMtkthxE4kYGFOF5E=; b=SlKidvMqSSHwSUkxenbC7SXcCkaFXwytjYuQRPhgIb/I2dW4vj7MxPX7mg2oEQgHWp 2WHXGLi94zuZNAIGsk7H1KlzINehMNKOXaX3K6DQ2m3LnfPz96R5TwNb6gr+XqbjLeVz p2anYu+ODhJpis5fhgCS2GbBz1ZvyeqjF+Y7+jZbd4L7gi0kdQc271augjgrNdzjG/xA bRlf4mZ7yqfnBUCmjICRPYE3TkSVfSf8ghigIjUMbDr8CL+BqziuL4FPuxO5Aqim8EEE VteJ9W6n8CD2X44eVwhF14INEMc4x37rt8ZXBnNThmEXi4NwgE5l9e5QwnyBvyeSdjTE Y+uw== X-Gm-Message-State: ALQs6tCb6DyvglmEuvOGT5lyDBYI4Edqcj0ewFuKUt7UJ8c9LRA6FhrR J8w6FSnPQJUTNleq6fpsAitYWRmR/p0= X-Google-Smtp-Source: AIpwx48l1pnsGZOGTmUySkC2ET0OWX4JkZQ50lTH1VAZOWuyz+Gdj3GrEunyqM2jliWlf52wwSZGEA== X-Received: by 10.80.190.68 with SMTP id b4mr32756493edi.164.1524575941348; Tue, 24 Apr 2018 06:19:01 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id w1sm9233105edf.57.2018.04.24.06.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:19:00 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] ath6kl: fix ath6kl_data_tx()'s return type Date: Tue, 24 Apr 2018 15:18:59 +0200 Message-Id: <20180424131900.5718-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/wireless/ath/ath6kl/core.h | 2 +- drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h index e23d450ba..0d30e762c 100644 --- a/drivers/net/wireless/ath/ath6kl/core.h +++ b/drivers/net/wireless/ath/ath6kl/core.h @@ -914,7 +914,7 @@ void ath6kl_tx_data_cleanup(struct ath6kl *ar); struct ath6kl_cookie *ath6kl_alloc_cookie(struct ath6kl *ar); void ath6kl_free_cookie(struct ath6kl *ar, struct ath6kl_cookie *cookie); -int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev); struct aggr_info *aggr_init(struct ath6kl_vif *vif); void aggr_conn_init(struct ath6kl_vif *vif, struct aggr_info *aggr_info, diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index 8da9506f8..618d12ed4 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -353,7 +353,7 @@ int ath6kl_control_tx(void *devt, struct sk_buff *skb, return status; } -int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev) { struct ath6kl *ar = ath6kl_priv(dev); struct ath6kl_cookie *cookie = NULL;