Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / chelsio / sge.c

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 58f6fc055f6a55cd1e9e3bc52af92b96cd31c9a4..3711d64e45effadfe4569c3cb37c7e40e476c414 100644 (file)
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1149,8 +1149,8 @@ static inline void write_tx_desc(struct cmdQ_e *e, dma_addr_t mapping,
                                 unsigned int len, unsigned int gen,
                                 unsigned int eop)
 {
-       if (unlikely(len > SGE_TX_DESC_MAX_PLEN))
-               BUG();
+       BUG_ON(len > SGE_TX_DESC_MAX_PLEN);
+
        e->addr_lo = (u32)mapping;
        e->addr_hi = (u64)mapping >> 32;
        e->len_gen = V_CMD_LEN(len) | V_CMD_GEN1(gen);
@@ -1879,7 +1879,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                cpl->vlan_valid = 0;
 
 send:
-       dev->trans_start = jiffies;
        ret = t1_sge_tx(skb, adapter, 0, dev);
 
        /* If transmit busy, and we reallocated skb's due to headroom limit,