mlx4_en: Counting all the dropped packets on the TX side

Reporting the counter's value through 'ethtool -S'

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yevgeny Petrilin 2009-06-20 22:15:31 +00:00 коммит произвёл David S. Miller
Родитель 6be832529a
Коммит 7e23091347
1 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -515,14 +515,12 @@ static int get_real_size(struct sk_buff *skb, struct net_device *dev,
else { else {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
en_warn(priv, "Non-linear headers\n"); en_warn(priv, "Non-linear headers\n");
dev_kfree_skb_any(skb);
return 0; return 0;
} }
} }
if (unlikely(*lso_header_size > MAX_LSO_HDR_SIZE)) { if (unlikely(*lso_header_size > MAX_LSO_HDR_SIZE)) {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
en_warn(priv, "LSO header size too big\n"); en_warn(priv, "LSO header size too big\n");
dev_kfree_skb_any(skb);
return 0; return 0;
} }
} else { } else {
@ -622,7 +620,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
} }
real_size = get_real_size(skb, dev, &lso_header_size); real_size = get_real_size(skb, dev, &lso_header_size);
if (unlikely(!real_size)) if (unlikely(!real_size))
return NETDEV_TX_OK; goto tx_drop;
/* Allign descriptor to TXBB size */ /* Allign descriptor to TXBB size */
desc_size = ALIGN(real_size, TXBB_SIZE); desc_size = ALIGN(real_size, TXBB_SIZE);
@ -630,8 +628,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(nr_txbb > MAX_DESC_TXBBS)) { if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
en_warn(priv, "Oversized header or SG list\n"); en_warn(priv, "Oversized header or SG list\n");
dev_kfree_skb_any(skb); goto tx_drop;
return NETDEV_TX_OK;
} }
tx_ind = skb->queue_mapping; tx_ind = skb->queue_mapping;
@ -657,8 +654,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(!priv->port_up)) { if (unlikely(!priv->port_up)) {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
en_warn(priv, "xmit: port down!\n"); en_warn(priv, "xmit: port down!\n");
dev_kfree_skb_any(skb); goto tx_drop;
return NETDEV_TX_OK;
} }
/* Track current inflight packets for performance analysis */ /* Track current inflight packets for performance analysis */
@ -785,5 +781,10 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
mlx4_en_xmit_poll(priv, tx_ind); mlx4_en_xmit_poll(priv, tx_ind);
return 0; return 0;
tx_drop:
dev_kfree_skb_any(skb);
priv->stats.tx_dropped++;
return NETDEV_TX_OK;
} }