diff options
| author | Julian Wiedmann <jwi@linux.vnet.ibm.com> | 2017-04-11 16:11:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-11 14:51:34 -0400 |
| commit | e38db6beeed0eac14e21bf3963fdba80043211e3 (patch) | |
| tree | 40adee8d9e270b5a9da8c29d870f841d9ddeb0eb /drivers/s390/net | |
| parent | 4e8d7e62560bba9772556ec6e11afcd20868d6a2 (diff) | |
| download | linux-stable-e38db6beeed0eac14e21bf3963fdba80043211e3.tar.gz linux-stable-e38db6beeed0eac14e21bf3963fdba80043211e3.tar.bz2 linux-stable-e38db6beeed0eac14e21bf3963fdba80043211e3.zip | |
s390/qeth: use correct return type for hard_start_xmit()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 3 | ||||
| -rw-r--r-- | 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; |