aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/netiucv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/net/netiucv.c')
-rw-r--r--drivers/s390/net/netiucv.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 87dff11061b0..9215fbbccc08 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -676,7 +676,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
676 * we must use netif_rx_ni() instead of netif_rx() 676 * we must use netif_rx_ni() instead of netif_rx()
677 */ 677 */
678 netif_rx_ni(skb); 678 netif_rx_ni(skb);
679 dev->last_rx = jiffies;
680 skb_pull(pskb, header->next); 679 skb_pull(pskb, header->next);
681 skb_put(pskb, NETIUCV_HDRLEN); 680 skb_put(pskb, NETIUCV_HDRLEN);
682 } 681 }
@@ -1376,14 +1375,14 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
1376 if (skb == NULL) { 1375 if (skb == NULL) {
1377 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n"); 1376 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n");
1378 privptr->stats.tx_dropped++; 1377 privptr->stats.tx_dropped++;
1379 return 0; 1378 return NETDEV_TX_OK;
1380 } 1379 }
1381 if (skb_headroom(skb) < NETIUCV_HDRLEN) { 1380 if (skb_headroom(skb) < NETIUCV_HDRLEN) {
1382 IUCV_DBF_TEXT(data, 2, 1381 IUCV_DBF_TEXT(data, 2,
1383 "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n"); 1382 "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n");
1384 dev_kfree_skb(skb); 1383 dev_kfree_skb(skb);
1385 privptr->stats.tx_dropped++; 1384 privptr->stats.tx_dropped++;
1386 return 0; 1385 return NETDEV_TX_OK;
1387 } 1386 }
1388 1387
1389 /** 1388 /**
@@ -1395,7 +1394,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
1395 privptr->stats.tx_dropped++; 1394 privptr->stats.tx_dropped++;
1396 privptr->stats.tx_errors++; 1395 privptr->stats.tx_errors++;
1397 privptr->stats.tx_carrier_errors++; 1396 privptr->stats.tx_carrier_errors++;
1398 return 0; 1397 return NETDEV_TX_OK;
1399 } 1398 }
1400 1399
1401 if (netiucv_test_and_set_busy(dev)) { 1400 if (netiucv_test_and_set_busy(dev)) {