net: cavium: fix return type of ndo_start_xmit function

[sfrench/cifs-2.6.git] / drivers / net / ethernet / cavium / octeon / octeon_mgmt.c

diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index bb43ddb7539e719d0cbff780e5ddf17c756dbe05..4b3aecf98f2affc746a2833128815f71b3aae8dc 100644 (file)
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -1268,12 +1268,13 @@ static int octeon_mgmt_stop(struct net_device *netdev)
        return 0;
 }
 
-static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t
+octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
        struct octeon_mgmt *p = netdev_priv(netdev);
        union mgmt_port_ring_entry re;
        unsigned long flags;
-       int rv = NETDEV_TX_BUSY;
+       netdev_tx_t rv = NETDEV_TX_BUSY;
 
        re.d64 = 0;
        re.s.tstamp = ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) != 0);