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

Commit d7afae05 authored by Jitendra Kalsaria's avatar Jitendra Kalsaria Committed by David S. Miller
Browse files

cnic: Rebranding cnic driver. 



o QLogic has acquired the NetXtremeII products and drivers from Broadcom.
  This patch re-brands cnic driver as a QLogic driver

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28c4ec0d

drivers/net/ethernet/broadcom/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ config BNX2 
	  will be called bnx2.  This is recommended.



config CNIC

	tristate "Broadcom CNIC support"

	tristate "QLogic CNIC support"

	depends on PCI

	select BNX2

	select UIO

	---help---

	  This driver supports offload features of Broadcom NetXtremeII

	  This driver supports offload features of QLogic NetXtremeII

	  gigabit Ethernet cards.



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

drivers/net/ethernet/broadcom/cnic.c

+6 −4
Original line number Diff line number Diff line 
/* cnic.c: Broadcom CNIC core network driver.

/* cnic.c: QLogic CNIC core network driver.

 *

 * Copyright (c) 2006-2014 Broadcom Corporation

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

 * the Free Software Foundation.

 *

 * Original skeleton written by: John(Zongxi) Chen (zongxi@broadcom.com)

 * Modified and maintained by: Michael Chan <mchan@broadcom.com>

 * Previously modified and maintained by: Michael Chan <mchan@broadcom.com>

 * Maintained By: Dept-HSGLinuxNICDev@qlogic.com

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -56,11 +58,11 @@ 
#define CNIC_MODULE_NAME	"cnic"



static char version[] =

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

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



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

	      "Chen (zongxi@broadcom.com");

MODULE_DESCRIPTION("Broadcom NetXtreme II CNIC Driver");

MODULE_DESCRIPTION("QLogic NetXtreme II CNIC Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(CNIC_MODULE_VERSION);

drivers/net/ethernet/broadcom/cnic.h

+2 −1
Original line number Diff line number Diff line 
/* cnic.h: Broadcom CNIC core network driver.

/* cnic.h: QLogic CNIC core network driver.

 *

 * Copyright (c) 2006-2014 Broadcom Corporation

 * Copyright (c) 2014 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_defs.h

+2 −1
Original line number Diff line number Diff line 


/* cnic.c: Broadcom CNIC core network driver.

/* cnic.c: QLogic CNIC core network driver.

 *

 * Copyright (c) 2006-2014 Broadcom Corporation

 * Copyright (c) 2014 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_if.h

+2 −1
Original line number Diff line number Diff line 
/* cnic_if.h: Broadcom CNIC core network driver.

/* cnic_if.h: QLogic CNIC core network driver.

 *

 * Copyright (c) 2006-2014 Broadcom Corporation

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