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

Commit e52c0f96 authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by Jeff Kirsher
Browse files

igb: Cleanups to change comment style on license headers 



This patch fixes WARNING:NETWORKING_BLOCK_COMMENT_STYLE from checkpatch file check.

Signed-off-by: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bed83e94

drivers/net/ethernet/intel/igb/e1000_82575.c

+22 −25
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2014 Intel Corporation.



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

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



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

/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 *

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

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 */



/* e1000_82575

 * e1000_82576

drivers/net/ethernet/intel/igb/e1000_82575.h

+23 −27
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2014 Intel Corporation.



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

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



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

/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 *

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

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 */



#ifndef _E1000_82575_H_

#define _E1000_82575_H_
@@ -92,8 +89,7 @@ union e1000_adv_rx_desc { 
		struct {

			struct {

				__le16 pkt_info;   /* RSS type, Packet type */

				__le16 hdr_info;   /* Split Header,

						    * header buffer length */

				__le16 hdr_info;   /* Split Head, buf len */

			} lo_dword;

			union {

				__le32 rss;          /* RSS Hash */

drivers/net/ethernet/intel/igb/e1000_defines.h

+30 −41
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2014 Intel Corporation.



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

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



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

/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 *

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

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 */



#ifndef _E1000_DEFINES_H_

#define _E1000_DEFINES_H_
@@ -307,33 +304,25 @@ 
#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */



/* DMA Coalescing register fields */

#define E1000_DMACR_DMACWT_MASK         0x00003FFF /* DMA Coalescing

							* Watchdog Timer */

#define E1000_DMACR_DMACTHR_MASK        0x00FF0000 /* DMA Coalescing Receive

							* Threshold */

#define E1000_DMACR_DMACWT_MASK         0x00003FFF /* DMA Coal Watchdog Timer */

#define E1000_DMACR_DMACTHR_MASK        0x00FF0000 /* DMA Coal Rx Threshold */

#define E1000_DMACR_DMACTHR_SHIFT       16

#define E1000_DMACR_DMAC_LX_MASK        0x30000000 /* Lx when no PCIe

							* transactions */

#define E1000_DMACR_DMAC_LX_MASK        0x30000000 /* Lx when no PCIe trans */

#define E1000_DMACR_DMAC_LX_SHIFT       28

#define E1000_DMACR_DMAC_EN             0x80000000 /* Enable DMA Coalescing */

/* DMA Coalescing BMC-to-OS Watchdog Enable */

#define E1000_DMACR_DC_BMC2OSW_EN	0x00008000



#define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coalescing Transmit

							* Threshold */

#define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coal Tx Threshold */



#define E1000_DMCTLX_TTLX_MASK          0x00000FFF /* Time to LX request */



#define E1000_DMCRTRH_UTRESH_MASK       0x0007FFFF /* Receive Traffic Rate

							* Threshold */

#define E1000_DMCRTRH_LRPRCW            0x80000000 /* Rcv packet rate in

							* current window */

#define E1000_DMCRTRH_UTRESH_MASK       0x0007FFFF /* Rx Traffic Rate Thresh */

#define E1000_DMCRTRH_LRPRCW            0x80000000 /* Rx pkt rate curr window */



#define E1000_DMCCNT_CCOUNT_MASK        0x01FFFFFF /* DMA Coal Rcv Traffic

							* Current Cnt */

#define E1000_DMCCNT_CCOUNT_MASK        0x01FFFFFF /* DMA Coal Rx Current Cnt */



#define E1000_FCRTC_RTH_COAL_MASK       0x0003FFF0 /* Flow ctrl Rcv Threshold

							* High val */

#define E1000_FCRTC_RTH_COAL_MASK       0x0003FFF0 /* FC Rx Thresh High val */

#define E1000_FCRTC_RTH_COAL_SHIFT      4

#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision */

drivers/net/ethernet/intel/igb/e1000_hw.h

+21 −25
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2014 Intel Corporation.



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

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



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

/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 *

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

 * under the terms and conditions of the GNU General Public License,

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 */



#ifndef _E1000_HW_H_

#define _E1000_HW_H_

drivers/net/ethernet/intel/igb/e1000_i210.c

+22 −25
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2014 Intel Corporation.



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

  under the terms and conditions of the GNU General Public License,

  version 2, as published by the Free Software Foundation.



  This program is distributed in the hope it will be useful, but WITHOUT

  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".



  Contact Information:

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



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

/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 *

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

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 */



/* e1000_i210

 * e1000_i211