Merge branch 'merge'

[linux-2.6-omap-h63xx.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 49cd096a3c3d03a92a2185265d77acfa599f4447..c99e87838f92913ce277c9a2494955551cb79f04 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3308,8 +3308,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
 
        while (poll_dev != &adapter->polling_netdev[i]) {
                i++;
-               if (unlikely(i == adapter->num_rx_queues))
-                       BUG();
+               BUG_ON(i == adapter->num_rx_queues);
        }
 
        if (likely(adapter->num_tx_queues == 1)) {
@@ -3769,6 +3768,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                        ps_page->ps_page[j] = NULL;
                        skb->len += length;
                        skb->data_len += length;
+                       skb->truesize += length;
                }
 
 copydone: