Skip to content

Commit

Permalink
octeontx2-pf: Fix inconsistent license text
Browse files Browse the repository at this point in the history 
Fixed inconsistent license text across the netdev
drivers.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sunil Goutham authored and David S. Miller committed Aug 29, 2021
1 parent d65a606 commit cb0e3ec
Showing 18 changed files with 45 additions and 54 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/marvell/octeontx2/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Marvell OcteonTX2 drivers configuration
# Marvell RVU Network drivers configuration
#

config OCTEONTX2_MBOX
2 changes: 1 addition & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Marvell's OcteonTX2 ethernet device drivers
# Makefile for Marvell's RVU Ethernet device drivers
#

obj-$(CONFIG_OCTEONTX2_PF) += rvu_nicpf.o
5 changes: 3 additions & 2 deletions drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Physcial Function ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2021 Marvell.
*
* Copyright (C) 2020 Marvell.
*/

#include "cn10k.h"
7 changes: 4 additions & 3 deletions drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0
* Marvell OcteonTx2 RVU Ethernet driver
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2021 Marvell.
*
* Copyright (C) 2020 Marvell.
*/

#ifndef CN10K_H
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <linux/interrupt.h>
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef OTX2_COMMON_H
3 changes: 2 additions & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Physcial Function ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2021 Marvell.
*
*/

#include "otx2_common.h"
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <linux/pci.h>
3 changes: 2 additions & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Physical Function ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell.
*
*/

#include <net/ipv6.h>
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Physical Function ethernet driver
/* Marvell RVU Physical Function ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <linux/module.h>
5 changes: 3 additions & 2 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 PTP support for ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell.
*
* Copyright (C) 2020 Marvell International Ltd.
*/

#include "otx2_common.h"
6 changes: 5 additions & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell OcteonTx2 PTP support for ethernet driver */
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell.
*
*/

#ifndef OTX2_PTP_H
#define OTX2_PTP_H
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_reg.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef OTX2_REG_H
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_struct.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef OTX2_STRUCT_H
4 changes: 3 additions & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Physcial Function ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2021 Marvell.
*
*/

#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/inetdevice.h>
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <linux/etherdevice.h>
7 changes: 2 additions & 5 deletions drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Marvell OcteonTx2 RVU Ethernet driver
/* Marvell RVU Ethernet driver
*
* Copyright (C) 2020 Marvell International Ltd.
* Copyright (C) 2020 Marvell.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef OTX2_TXRX_H
6 changes: 5 additions & 1 deletion drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/* Marvell OcteonTx2 RVU Virtual Function ethernet driver */
/* Marvell RVU Virtual Function ethernet driver
*
* Copyright (C) 2020 Marvell.
*
*/

#include <linux/etherdevice.h>
#include <linux/module.h>

0 comments on commit cb0e3ec

Please sign in to comment.