diff options
author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2014-04-10 21:46:06 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-24 20:26:27 -0400 |
commit | e52c0f960cbc2c691cbb809ac0bfec2becfe6da9 (patch) | |
tree | e12f2d5ebc40595c43b27c1913459676c0695362 /drivers/net/ethernet/intel/igb/igb_main.c | |
parent | bed83e94d01d1ede2b2db0cf58f8eecb63ac1eb9 (diff) |
igb: Cleanups to change comment style on license headers
This patch fixes WARNING:NETWORKING_BLOCK_COMMENT_STYLE from checkpatch file check.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 50cfe7db3b12..299ac1415146 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -1,28 +1,25 @@ | |||
1 | /******************************************************************************* | 1 | /* Intel(R) Gigabit Ethernet Linux driver |
2 | 2 | * Copyright(c) 2007-2014 Intel Corporation. | |
3 | Intel(R) Gigabit Ethernet Linux driver | 3 | * |
4 | Copyright(c) 2007-2014 Intel Corporation. | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | 5 | * under the terms and conditions of the GNU General Public License, | |
6 | This program is free software; you can redistribute it and/or modify it | 6 | * version 2, as published by the Free Software Foundation. |
7 | under the terms and conditions of the GNU General Public License, | 7 | * |
8 | version 2, as published by the Free Software Foundation. | 8 | * This program is distributed in the hope it will be useful, but WITHOUT |
9 | 9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
10 | This program is distributed in the hope it will be useful, but WITHOUT | 10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
11 | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | 11 | * more details. |
12 | FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | 12 | * |
13 | more details. | 13 | * You should have received a copy of the GNU General Public License along with |
14 | 14 | * this program; if not, see <http://www.gnu.org/licenses/>. | |
15 | You should have received a copy of the GNU General Public License along with | 15 | * |
16 | this program; if not, see <http://www.gnu.org/licenses/>. | 16 | * The full GNU General Public License is included in this distribution in |
17 | 17 | * the file called "COPYING". | |
18 | The full GNU General Public License is included in this distribution in | 18 | * |
19 | the file called "COPYING". | 19 | * Contact Information: |
20 | 20 | * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> | |
21 | Contact Information: | 21 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
22 | e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> | 22 | */ |
23 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | ||
24 | |||
25 | *******************************************************************************/ | ||
26 | 23 | ||
27 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 24 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
28 | 25 | ||
@@ -1285,8 +1282,7 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, | |||
1285 | if (adapter->hw.mac.type >= e1000_82576) | 1282 | if (adapter->hw.mac.type >= e1000_82576) |
1286 | set_bit(IGB_RING_FLAG_RX_SCTP_CSUM, &ring->flags); | 1283 | set_bit(IGB_RING_FLAG_RX_SCTP_CSUM, &ring->flags); |
1287 | 1284 | ||
1288 | /* | 1285 | /* On i350, i354, i210, and i211, loopback VLAN packets |
1289 | * On i350, i354, i210, and i211, loopback VLAN packets | ||
1290 | * have the tag byte-swapped. | 1286 | * have the tag byte-swapped. |
1291 | */ | 1287 | */ |
1292 | if (adapter->hw.mac.type >= e1000_i350) | 1288 | if (adapter->hw.mac.type >= e1000_i350) |
@@ -2528,7 +2524,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2528 | } | 2524 | } |
2529 | 2525 | ||
2530 | /* let the f/w know that the h/w is now under the control of the | 2526 | /* let the f/w know that the h/w is now under the control of the |
2531 | * driver. */ | 2527 | * driver. |
2528 | */ | ||
2532 | igb_get_hw_control(adapter); | 2529 | igb_get_hw_control(adapter); |
2533 | 2530 | ||
2534 | strcpy(netdev->name, "eth%d"); | 2531 | strcpy(netdev->name, "eth%d"); |