diff --git a/[refs] b/[refs] index 1b3baa78b5a6..2f554e671e7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47f88c99c2ad0c05dd415e1c2a6d59426eb305ed +refs/heads/master: ae71bafdd4ce29856addfede1ab7046f4e45775b diff --git a/trunk/drivers/s390/net/claw.c b/trunk/drivers/s390/net/claw.c index 30a43cc79e76..7b6f46ddf3c3 100644 --- a/trunk/drivers/s390/net/claw.c +++ b/trunk/drivers/s390/net/claw.c @@ -338,12 +338,6 @@ claw_tx(struct sk_buff *skb, struct net_device *dev) CLAW_DBF_TEXT(4, trace, "claw_tx"); p_ch=&privptr->channel[WRITE]; - if (skb == NULL) { - privptr->stats.tx_dropped++; - privptr->stats.tx_errors++; - CLAW_DBF_TEXT_(2, trace, "clawtx%d", -EIO); - return -EIO; - } spin_lock_irqsave(get_ccwdev_lock(p_ch->cdev), saveflags); rc=claw_hw_tx( skb, dev, 1 ); spin_unlock_irqrestore(get_ccwdev_lock(p_ch->cdev), saveflags);