diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 4ec61243da82..ad2125e5a7f7 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c | |||
| @@ -1,26 +1,5 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | /* Intel(R) Gigabit Ethernet Linux driver | 2 | /* Copyright(c) 2007 - 2018 Intel Corporation. */ |
| 3 | * Copyright(c) 2007-2015 Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, see <http://www.gnu.org/licenses/>. | ||
| 16 | * | ||
| 17 | * The full GNU General Public License is included in this distribution in | ||
| 18 | * the file called "COPYING". | ||
| 19 | * | ||
| 20 | * Contact Information: | ||
| 21 | * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> | ||
| 22 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | ||
| 23 | */ | ||
| 24 | 3 | ||
| 25 | #include <linux/if_ether.h> | 4 | #include <linux/if_ether.h> |
| 26 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| @@ -680,6 +659,7 @@ s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw) | |||
| 680 | phy_data |= M88E1000_PSCR_AUTO_X_1000T; | 659 | phy_data |= M88E1000_PSCR_AUTO_X_1000T; |
| 681 | break; | 660 | break; |
| 682 | } | 661 | } |
| 662 | /* fall through */ | ||
| 683 | case 0: | 663 | case 0: |
| 684 | default: | 664 | default: |
| 685 | phy_data |= M88E1000_PSCR_AUTO_X_MODE; | 665 | phy_data |= M88E1000_PSCR_AUTO_X_MODE; |
