1 files changed, 22 insertions, 14 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 49e0e51a9df..8466d351a70 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
 /* bnx2.c: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004-2008 Broadcom Corporation
+ * Copyright (c) 2004-2009 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,8 +57,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.9.0"
-#define DRV_MODULE_RELDATE      "Dec 16, 2008"
+#define DRV_MODULE_VERSION      "1.9.2"
+#define DRV_MODULE_RELDATE      "Feb 11, 2009"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -2920,18 +2920,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
 
                 rx_hdr = (struct l2_fhdr *) skb->data;
                 len = rx_hdr->l2_fhdr_pkt_len;
+                status = rx_hdr->l2_fhdr_status;
 
-                if ((status = rx_hdr->l2_fhdr_status) &
-                        (L2_FHDR_ERRORS_BAD_CRC |
-                        L2_FHDR_ERRORS_PHY_DECODE |
-                        L2_FHDR_ERRORS_ALIGNMENT |
-                        L2_FHDR_ERRORS_TOO_SHORT |
-                        L2_FHDR_ERRORS_GIANT_FRAME)) {
-
-                        bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,
-                                          sw_ring_prod);
-                        goto next_rx;
-                }
                 hdr_len = 0;
                 if (status & L2_FHDR_STATUS_SPLIT) {
                         hdr_len = rx_hdr->l2_fhdr_ip_xsum;
@@ -2941,6 +2931,24 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                         pg_ring_used = 1;
                 }
 
+                if (unlikely(status & (L2_FHDR_ERRORS_BAD_CRC |
+                                       L2_FHDR_ERRORS_PHY_DECODE |
+                                       L2_FHDR_ERRORS_ALIGNMENT |
+                                       L2_FHDR_ERRORS_TOO_SHORT |
+                                       L2_FHDR_ERRORS_GIANT_FRAME))) {
+
+                        bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,
+                                          sw_ring_prod);
+                        if (pg_ring_used) {
+                                int pages;
+
+                                pages = PAGE_ALIGN(len - hdr_len) >> PAGE_SHIFT;
+
+                                bnx2_reuse_rx_skb_pages(bp, rxr, NULL, pages);
+                        }
+                        goto next_rx;
+                }
+
                 len -= 4;
 
                 if (len <= bp->rx_copy_thresh) {