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

Commit 50579d3d authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio CN23XX: copyrights changes and alignment 



Updated copyrights comments and also changed some other comments
alignments.

Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 763185a3

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c

+23 −30
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@cavium.com

 *          Please include "LiquidIO" in the subject.

 *

* Copyright (c) 2003-2015 Cavium, Inc.

 * Copyright (c) 2003-2016 Cavium, Inc.

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,15 +13,9 @@ 
 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/



 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

#include <linux/pci.h>

#include <linux/netdevice.h>

#include <linux/vmalloc.h>

#include <linux/etherdevice.h>

#include "liquidio_common.h"
@@ -1391,8 +1385,7 @@ void cn23xx_dump_iq_regs(struct octeon_device *oct) 
		dev_dbg(&oct->pci_dev->dev, "SLI_PKT[%d]_INPUT_CTL [0x%x]: 0x%016llx\n",

			q_no, CN23XX_SLI_IQ_PKT_CONTROL64(q_no),

			CVM_CAST64(octeon_read_csr64

				(oct,

					CN23XX_SLI_IQ_PKT_CONTROL64(q_no))));

				(oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no))));

	}



	pci_read_config_dword(oct->pci_dev, CN23XX_CONFIG_PCIE_DEVCTL, &regval);

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h

+17 −22
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@cavium.com

 *          Please include "LiquidIO" in the subject.

 *

* Copyright (c) 2003-2015 Cavium, Inc.

 * Copyright (c) 2003-2016 Cavium, Inc.

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@ 
 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/



 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

/*! \file  cn23xx_device.h

 * \brief Host Driver: Routines that perform CN23XX specific operations.

 */

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h

+17 −22
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@cavium.com

 *          Please include "LiquidIO" in the subject.

 *

* Copyright (c) 2003-2015 Cavium, Inc.

 * Copyright (c) 2003-2016 Cavium, Inc.

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@ 
 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/



 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

/*! \file cn23xx_regs.h

 * \brief Host Driver: Register Address and Register Mask values for

 * Octeon CN23XX devices.

drivers/net/ethernet/cavium/liquidio/cn66xx_device.c

+16 −20
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@cavium.com

 *          Please include "LiquidIO" in the subject.

 *

* Copyright (c) 2003-2015 Cavium, Inc.

 * Copyright (c) 2003-2016 Cavium, Inc.

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,12 +13,8 @@ 
 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/

 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

#include <linux/pci.h>

#include <linux/netdevice.h>

#include "liquidio_common.h"

drivers/net/ethernet/cavium/liquidio/cn66xx_device.h

+16 −21
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@cavium.com

 *          Please include "LiquidIO" in the subject.

 *

* Copyright (c) 2003-2015 Cavium, Inc.

 * Copyright (c) 2003-2016 Cavium, Inc.

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@ 
 * This file is distributed in the hope that it will be useful, but

 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/



 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

/*! \file  cn66xx_device.h

 *  \brief Host Driver: Routines that perform CN66XX specific operations.

 */