diff options
| author | David S. Miller | 2019-07-09 04:48:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-09 04:48:57 +0200 |
| commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
| tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | skbuff: increase verbosity when dumping skb data (diff) | |
| parent | tcp: Reset bytes_acked and bytes_received when disconnecting (diff) | |
| download | kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.gz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.xz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index c4986b519191..656ed80647f0 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3857,9 +3857,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { if (!(bp->flags & TX_TIMESTAMPING_EN)) { + bp->eth_stats.ptp_skip_tx_ts++; BNX2X_ERR("Tx timestamping was not enabled, this packet will not be timestamped\n"); } else if (bp->ptp_tx_skb) { - BNX2X_ERR("The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n"); + bp->eth_stats.ptp_skip_tx_ts++; + netdev_err_once(bp->dev, + "Device supports only a single outstanding packet to timestamp, this packet won't be timestamped\n"); } else { skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; /* schedule check for Tx timestamp */ |