From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-s390@vger.kernel.org>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Stefan Raspl <raspl@linux.vnet.ibm.com>,
Ursula Braun <ubraun@linux.vnet.ibm.com>,
Julian Wiedmann <jwi@linux.vnet.ibm.com>
Subject: [PATCH net-next 05/10] s390/qeth: use correct return type for hard_start_xmit()
Date: Tue, 11 Apr 2017 16:11:14 +0200 [thread overview]
Message-ID: <20170411141119.82526-6-jwi@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170411141119.82526-1-jwi@linux.vnet.ibm.com>
ndo_start_xmit() expects us to return netdev_tx_t here...
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
---
drivers/s390/net/qeth_l2_main.c | 3 ++-
drivers/s390/net/qeth_l3_main.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index ab0d065a9ba2..11cf4a4b36a6 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -681,7 +681,8 @@ static void qeth_l2_set_rx_mode(struct net_device *dev)
qeth_promisc_to_bridge(card);
}
-static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
int rc;
struct qeth_hdr *hdr = NULL;
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 7d902b93fd5a..bea0bae0faf7 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2655,7 +2655,8 @@ static int qeth_l3_get_elements_no_tso(struct qeth_card *card,
return elements;
}
-static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
int rc;
__be16 *tag;
--
2.10.2
next prev parent reply other threads:[~2017-04-11 14:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 14:11 [PATCH net-next 00/10] more s390/net updates Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 01/10] s390/qeth: move common ioctl handling to core Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 02/10] s390/qeth: move NAPI poll routine " Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 03/10] s390/qeth: move gdev shutdown handler " Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 04/10] s390/qeth: remove unused parameter Julian Wiedmann
2017-04-11 14:11 ` Julian Wiedmann [this message]
2017-04-11 14:11 ` [PATCH net-next 06/10] s390/qeth: use and remove some defines Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 07/10] s390/qeth: clean up qeth_set_ecmd_adv_sup() Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 08/10] s390/qeth: convert to ETHTOOL_GLINKSETTINGS API Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 09/10] s390/qeth: use LINK_MODE_* to report the link characteristics Julian Wiedmann
2017-04-11 14:11 ` [PATCH net-next 10/10] s390/qeth: remove unimplemented gdev routines Julian Wiedmann
2017-04-11 18:51 ` [PATCH net-next 00/10] more s390/net updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170411141119.82526-6-jwi@linux.vnet.ibm.com \
--to=jwi@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.vnet.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=ubraun@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).