diff --git a/[refs] b/[refs]
index e7cde3f7578b..84c75db998e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e584d66ea60cf3d921aea78372f4e4d48a9155d
+refs/heads/master: 8f0c40d4b6a6207ef2105d94544a9d1c0835c4ab
diff --git a/trunk/drivers/s390/net/claw.c b/trunk/drivers/s390/net/claw.c
index 6669adf355be..a4524ecd9dc4 100644
--- a/trunk/drivers/s390/net/claw.c
+++ b/trunk/drivers/s390/net/claw.c
@@ -348,6 +348,8 @@ claw_tx(struct sk_buff *skb, struct net_device *dev)
         rc=claw_hw_tx( skb, dev, 1 );
         spin_unlock_irqrestore(get_ccwdev_lock(p_ch->cdev), saveflags);
 	CLAW_DBF_TEXT_(4, trace, "clawtx%d", rc);
+	if (rc)
+		rc = NETDEV_TX_BUSY;
         return rc;
 }   /*  end of claw_tx */