diff options
author | Michael Chan <mchan@broadcom.com> | 2005-11-04 11:53:48 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2005-11-05 21:00:03 -0500 |
commit | 05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0 (patch) | |
tree | 4fc8c28bc87d4f68e452fd99daa76df9e254a524 /drivers/net | |
parent | f4e418f7f3286f854883f9f7e3bbf7005340d2de (diff) |
[PATCH] bnx2: update version and minor fixes
Some book keeping and a style fix.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bnx2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index aa6d30e0d829..8f464271664d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | #define DRV_MODULE_NAME "bnx2" | 15 | #define DRV_MODULE_NAME "bnx2" |
16 | #define PFX DRV_MODULE_NAME ": " | 16 | #define PFX DRV_MODULE_NAME ": " |
17 | #define DRV_MODULE_VERSION "1.2.21" | 17 | #define DRV_MODULE_VERSION "1.4.30" |
18 | #define DRV_MODULE_RELDATE "September 7, 2005" | 18 | #define DRV_MODULE_RELDATE "October 11, 2005" |
19 | 19 | ||
20 | #define RUN_AT(x) (jiffies + (x)) | 20 | #define RUN_AT(x) (jiffies + (x)) |
21 | 21 | ||
@@ -26,7 +26,7 @@ static char version[] __devinitdata = | |||
26 | "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; | 26 | "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; |
27 | 27 | ||
28 | MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); | 28 | MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); |
29 | MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706 Driver"); | 29 | MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708 Driver"); |
30 | MODULE_LICENSE("GPL"); | 30 | MODULE_LICENSE("GPL"); |
31 | MODULE_VERSION(DRV_MODULE_VERSION); | 31 | MODULE_VERSION(DRV_MODULE_VERSION); |
32 | 32 | ||
@@ -3364,7 +3364,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp) | |||
3364 | struct sw_bd *rx_buf = &bp->rx_buf_ring[i]; | 3364 | struct sw_bd *rx_buf = &bp->rx_buf_ring[i]; |
3365 | struct sk_buff *skb = rx_buf->skb; | 3365 | struct sk_buff *skb = rx_buf->skb; |
3366 | 3366 | ||
3367 | if (skb == 0) | 3367 | if (skb == NULL) |
3368 | continue; | 3368 | continue; |
3369 | 3369 | ||
3370 | pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping), | 3370 | pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping), |