diff options
| author | Michael Chan <mchan@broadcom.com> | 2005-11-04 08:53:48 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2005-11-05 21:00:03 -0500 |
| commit | 05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0 (patch) | |
| tree | 4fc8c28bc87d4f68e452fd99daa76df9e254a524 /drivers/net/bnx2.c | |
| parent | f4e418f7f3286f854883f9f7e3bbf7005340d2de (diff) | |
| download | linux-3.10-05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0.tar.gz linux-3.10-05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0.tar.bz2 linux-3.10-05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0.zip | |
[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/bnx2.c')
| -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 aa6d30e0d82..8f464271664 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -14,8 +14,8 @@ #define DRV_MODULE_NAME "bnx2" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.2.21" -#define DRV_MODULE_RELDATE "September 7, 2005" +#define DRV_MODULE_VERSION "1.4.30" +#define DRV_MODULE_RELDATE "October 11, 2005" #define RUN_AT(x) (jiffies + (x)) @@ -26,7 +26,7 @@ static char version[] __devinitdata = "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); -MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706 Driver"); +MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708 Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_MODULE_VERSION); @@ -3364,7 +3364,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp) struct sw_bd *rx_buf = &bp->rx_buf_ring[i]; struct sk_buff *skb = rx_buf->skb; - if (skb == 0) + if (skb == NULL) continue; pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping), |