Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931c471a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnx2x-next' 



Rasesh Mody says:

====================
bnx2-cnic: Driver Version Upgrades

This patch set includes bnx2 and cnic drivers' re-branding changes, fix for a
chip initialization issue and updates the bnx2 driver version to 2.2.6 and
cnic driver version to 2.5.21.

Please apply these patches to net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 959d10f6 85fe7cd2

drivers/net/ethernet/broadcom/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ config BCMGENET 
	  Broadcom BCM7xxx Set Top Box family chipset.



config BNX2

	tristate "QLogic NetXtremeII support"

	tristate "QLogic bnx2 support"

	depends on PCI

	select CRC32

	select FW_LOADER

	---help---

	  This driver supports QLogic NetXtremeII gigabit Ethernet cards.

	  This driver supports QLogic bnx2 gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called bnx2.  This is recommended.
@@ -87,8 +87,8 @@ config CNIC 
	select BNX2

	select UIO

	---help---

	  This driver supports offload features of QLogic NetXtremeII

	  gigabit Ethernet cards.

	  This driver supports offload features of QLogic bnx2 gigabit

	  Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called cnic.  This is recommended.

drivers/net/ethernet/broadcom/bnx2.c

+6 −8
Original line number Diff line number Diff line 
/* bnx2.c: QLogic NX2 network driver.

/* bnx2.c: QLogic bnx2 network driver.

 *

 * Copyright (c) 2004-2014 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * Copyright (c) 2014-2015 QLogic 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
@@ -58,8 +58,8 @@ 
#include "bnx2_fw.h"



#define DRV_MODULE_NAME		"bnx2"

#define DRV_MODULE_VERSION	"2.2.5"

#define DRV_MODULE_RELDATE	"December 20, 2013"

#define DRV_MODULE_VERSION	"2.2.6"

#define DRV_MODULE_RELDATE	"January 29, 2014"

#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.3.fw"

#define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-6.0.15.fw"

#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -72,10 +72,10 @@ 
#define TX_TIMEOUT  (5*HZ)



static char version[] =

	"QLogic NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";

	"QLogic " DRV_MODULE_NAME " Gigabit Ethernet Driver v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";



MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");

MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");

MODULE_DESCRIPTION("QLogic BCM5706/5708/5709/5716 Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_MODULE_VERSION);

MODULE_FIRMWARE(FW_MIPS_FILE_06);
@@ -4984,8 +4984,6 @@ bnx2_init_chip(struct bnx2 *bp) 


	bp->idle_chk_status_idx = 0xffff;



	bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE;



	/* Set up how to generate a link change interrupt. */

	BNX2_WR(bp, BNX2_EMAC_ATTENTION_ENA, BNX2_EMAC_ATTENTION_ENA_LINK);

drivers/net/ethernet/broadcom/bnx2.h

+2 −2
Original line number Diff line number Diff line 
/* bnx2.h: QLogic NX2 network driver.

/* bnx2.h: QLogic bnx2 network driver.

 *

 * Copyright (c) 2004-2014 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * Copyright (c) 2014-2015 QLogic 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

drivers/net/ethernet/broadcom/bnx2_fw.h

+2 −2
Original line number Diff line number Diff line 
/* bnx2_fw.h: QLogic NX2 network driver.

/* bnx2_fw.h: QLogic bnx2 network driver.

 *

 * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * Copyright (c) 2014-2015 QLogic 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

drivers/net/ethernet/broadcom/cnic.c

+3 −3
Original line number Diff line number Diff line 
/* cnic.c: QLogic CNIC core network driver.

 *

 * Copyright (c) 2006-2014 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * Copyright (c) 2014-2015 QLogic 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
@@ -58,11 +58,11 @@ 
#define CNIC_MODULE_NAME	"cnic"



static char version[] =

	"QLogic NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";

	"QLogic " CNIC_MODULE_NAME "Driver v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";



MODULE_AUTHOR("Michael Chan <mchan@broadcom.com> and John(Zongxi) "

	      "Chen (zongxi@broadcom.com");

MODULE_DESCRIPTION("QLogic NetXtreme II CNIC Driver");

MODULE_DESCRIPTION("QLogic cnic Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(CNIC_MODULE_VERSION);