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

Commit c31fd6c2 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

usbnet: remove direct access to urb->status 



USB drivers should not use urb->status directly because
it is scheduled to become a parameter. This does the conversion
for drivers/net/usb

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 396e799c

drivers/net/usb/cdc-phonet.c

+5 −3
Original line number Diff line number Diff line
@@ -97,8 +97,9 @@ static void tx_complete(struct urb *req) 
	struct sk_buff *skb = req->context;

	struct net_device *dev = skb->dev;

	struct usbpn_dev *pnd = netdev_priv(dev);

	int status = req->status;



	switch (req->status) {

	switch (status) {

	case 0:

		dev->stats.tx_bytes += skb->len;

		break;
@@ -109,7 +110,7 @@ static void tx_complete(struct urb *req) 
		dev->stats.tx_aborted_errors++;

	default:

		dev->stats.tx_errors++;

		dev_dbg(&dev->dev, "TX error (%d)\n", req->status);

		dev_dbg(&dev->dev, "TX error (%d)\n", status);

	}

	dev->stats.tx_packets++;
@@ -150,8 +151,9 @@ static void rx_complete(struct urb *req) 
	struct page *page = virt_to_page(req->transfer_buffer);

	struct sk_buff *skb;

	unsigned long flags;

	int status = req->status;



	switch (req->status) {

	switch (status) {

	case 0:

		spin_lock_irqsave(&pnd->rx_lock, flags);

		skb = pnd->rx_skb;

drivers/net/usb/ipheth.c

+7 −6
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb) 
	case 0:

		break;

	default:

		err("%s: urb status: %d", __func__, urb->status);

		err("%s: urb status: %d", __func__, status);

		return;

	}
@@ -222,16 +222,17 @@ static void ipheth_rcvbulk_callback(struct urb *urb) 
static void ipheth_sndbulk_callback(struct urb *urb)

{

	struct ipheth_device *dev;

	int status = urb->status;



	dev = urb->context;

	if (dev == NULL)

		return;



	if (urb->status != 0 &&

	    urb->status != -ENOENT &&

	    urb->status != -ECONNRESET &&

	    urb->status != -ESHUTDOWN)

		err("%s: urb status: %d", __func__, urb->status);

	if (status != 0 &&

	    status != -ENOENT &&

	    status != -ECONNRESET &&

	    status != -ESHUTDOWN)

		err("%s: urb status: %d", __func__, status);



	dev_kfree_skb_irq(dev->tx_skb);

	netif_wake_queue(dev->net);