Merge commit 'origin/master' into next

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 58f6fc055f6a..3711d64e45ef 100644
--- 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,