diff options
Diffstat (limited to 'drivers/net/ethernet/realtek/8139too.c')
-rw-r--r-- | drivers/net/ethernet/realtek/8139too.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index da5972eefdd2..2e5df148af4c 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c | |||
@@ -1717,9 +1717,9 @@ static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb, | |||
1717 | if (len < ETH_ZLEN) | 1717 | if (len < ETH_ZLEN) |
1718 | memset(tp->tx_buf[entry], 0, ETH_ZLEN); | 1718 | memset(tp->tx_buf[entry], 0, ETH_ZLEN); |
1719 | skb_copy_and_csum_dev(skb, tp->tx_buf[entry]); | 1719 | skb_copy_and_csum_dev(skb, tp->tx_buf[entry]); |
1720 | dev_kfree_skb(skb); | 1720 | dev_kfree_skb_any(skb); |
1721 | } else { | 1721 | } else { |
1722 | dev_kfree_skb(skb); | 1722 | dev_kfree_skb_any(skb); |
1723 | dev->stats.tx_dropped++; | 1723 | dev->stats.tx_dropped++; |
1724 | return NETDEV_TX_OK; | 1724 | return NETDEV_TX_OK; |
1725 | } | 1725 | } |
@@ -2522,16 +2522,16 @@ rtl8139_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) | |||
2522 | netdev_stats_to_stats64(stats, &dev->stats); | 2522 | netdev_stats_to_stats64(stats, &dev->stats); |
2523 | 2523 | ||
2524 | do { | 2524 | do { |
2525 | start = u64_stats_fetch_begin_bh(&tp->rx_stats.syncp); | 2525 | start = u64_stats_fetch_begin_irq(&tp->rx_stats.syncp); |
2526 | stats->rx_packets = tp->rx_stats.packets; | 2526 | stats->rx_packets = tp->rx_stats.packets; |
2527 | stats->rx_bytes = tp->rx_stats.bytes; | 2527 | stats->rx_bytes = tp->rx_stats.bytes; |
2528 | } while (u64_stats_fetch_retry_bh(&tp->rx_stats.syncp, start)); | 2528 | } while (u64_stats_fetch_retry_irq(&tp->rx_stats.syncp, start)); |
2529 | 2529 | ||
2530 | do { | 2530 | do { |
2531 | start = u64_stats_fetch_begin_bh(&tp->tx_stats.syncp); | 2531 | start = u64_stats_fetch_begin_irq(&tp->tx_stats.syncp); |
2532 | stats->tx_packets = tp->tx_stats.packets; | 2532 | stats->tx_packets = tp->tx_stats.packets; |
2533 | stats->tx_bytes = tp->tx_stats.bytes; | 2533 | stats->tx_bytes = tp->tx_stats.bytes; |
2534 | } while (u64_stats_fetch_retry_bh(&tp->tx_stats.syncp, start)); | 2534 | } while (u64_stats_fetch_retry_irq(&tp->tx_stats.syncp, start)); |
2535 | 2535 | ||
2536 | return stats; | 2536 | return stats; |
2537 | } | 2537 | } |