Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a79c41 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

usbnet: convert to netdev_tx_t 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b62ff2d

drivers/net/usb/catc.c

+2 −1
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ static void catc_tx_done(struct urb *urb) 
	spin_unlock_irqrestore(&catc->tx_lock, flags);

}



static int catc_start_xmit(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t catc_start_xmit(struct sk_buff *skb,

					 struct net_device *netdev)

{

	struct catc *catc = netdev_priv(netdev);

	unsigned long flags;

drivers/net/usb/cdc-phonet.c

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void rx_complete(struct urb *req); 
/*

 * Network device callbacks

 */

static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t usbpn_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct usbpn_dev *pnd = netdev_priv(dev);

	struct urb *req = NULL;
@@ -82,12 +82,12 @@ static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (pnd->tx_queue >= dev->tx_queue_len)

		netif_stop_queue(dev);

	spin_unlock_irqrestore(&pnd->tx_lock, flags);

	return 0;

	return NETDEV_TX_OK;



drop:

	dev_kfree_skb(skb);

	dev->stats.tx_dropped++;

	return 0;

	return NETDEV_TX_OK;

}



static void tx_complete(struct urb *req)

drivers/net/usb/hso.c

+2 −1
Original line number Diff line number Diff line
@@ -771,7 +771,8 @@ static void write_bulk_callback(struct urb *urb) 
}



/* called by kernel when we need to transmit a packet */

static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net)

static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb,

					    struct net_device *net)

{

	struct hso_net *odev = netdev_priv(net);

	int result;

drivers/net/usb/kaweth.c

+2 −1
Original line number Diff line number Diff line
@@ -803,7 +803,8 @@ static void kaweth_usb_transmit_complete(struct urb *urb) 
/****************************************************************

 *     kaweth_start_xmit

 ****************************************************************/

static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)

static netdev_tx_t kaweth_start_xmit(struct sk_buff *skb,

					   struct net_device *net)

{

	struct kaweth_device *kaweth = netdev_priv(net);

	__le16 *private_header;

drivers/net/usb/pegasus.c

+2 −1
Original line number Diff line number Diff line
@@ -876,7 +876,8 @@ static void pegasus_tx_timeout(struct net_device *net) 
	pegasus->stats.tx_errors++;

}



static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net)

static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb,

					    struct net_device *net)

{

	pegasus_t *pegasus = netdev_priv(net);

	int count = ((skb->len + 2) & 0x3f) ? skb->len + 2 : skb->len + 3;