OSDN Git Service

s390/qeth: use correct return type for hard_start_xmit()
authorJulian Wiedmann <jwi@linux.vnet.ibm.com>
Tue, 11 Apr 2017 14:11:14 +0000 (16:11 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Apr 2017 18:51:34 +0000 (14:51 -0400)
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>
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c

index ab0d065..11cf4a4 100644 (file)
@@ -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;
index 7d902b9..bea0bae 100644 (file)
@@ -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;