From 3603e1b5679524696e2a2f0acd1e84ab8602840b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 12 Jun 2009 06:14:36 +0000
Subject: [PATCH] --- yaml --- r: 150935 b: refs/heads/master c:
 5b2c4b972c0226406361f83b747eb5cdab51e68e h: refs/heads/master i:   150933:
 f37b3a5a9cbb99e0653790dd3cb9a9378376d67f   150931:
 5e74e396a03e6c3988d6e6346fb600f182daa6e4   150927:
 890c534e9724dd8fcedf5d7c7b2077209d548f74 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/usb/hso.c               | 2 +-
 trunk/drivers/staging/at76_usb/at76_usb.c | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c0d4a8516dc4..996949c189e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81fbbf60408ad6b98ff72120de948cb7fd2498d0
+refs/heads/master: 5b2c4b972c0226406361f83b747eb5cdab51e68e
diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c
index e3580f42c899..f8c6d7ea7264 100644
--- a/trunk/drivers/net/usb/hso.c
+++ b/trunk/drivers/net/usb/hso.c
@@ -816,7 +816,7 @@ static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net)
 	}
 	dev_kfree_skb(skb);
 	/* we're done */
-	return result;
+	return NETDEV_TX_OK;
 }
 
 static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
diff --git a/trunk/drivers/staging/at76_usb/at76_usb.c b/trunk/drivers/staging/at76_usb/at76_usb.c
index c8af9a868d62..3f303ae97b43 100644
--- a/trunk/drivers/staging/at76_usb/at76_usb.c
+++ b/trunk/drivers/staging/at76_usb/at76_usb.c
@@ -3242,12 +3242,11 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
 			       "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
 			       priv->netdev->name, priv->tx_urb,
 			       priv->tx_urb->hcpriv, priv->tx_urb->complete);
-	} else {
+	} else
 		stats->tx_bytes += skb->len;
-		dev_kfree_skb(skb);
-	}
 
-	return ret;
+	dev_kfree_skb(skb);
+	return NETDEV_TX_OK;
 }
 
 static void at76_tx_timeout(struct net_device *netdev)