1 files changed, 9 insertions, 33 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ec4a9759a6f2..16a73bd9f4cb 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1,24 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Intel PRO/1000 Linux driver
- * Copyright(c) 1999 - 2015 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.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Contact Information:
- * Linux NICS <linux.nics@intel.com>
- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- */
+/* Copyright(c) 1999 - 2018 Intel Corporation. */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -3331,7 +3312,7 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
                 return 0;
         }
 
-        mta_list = kzalloc(netdev_mc_count(netdev) * ETH_ALEN, GFP_ATOMIC);
+        mta_list = kcalloc(netdev_mc_count(netdev), ETH_ALEN, GFP_ATOMIC);
         if (!mta_list)
                 return -ENOMEM;
 
@@ -3546,15 +3527,12 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)
                 }
                 break;
         case e1000_pch_spt:
-                if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
-                        /* Stable 24MHz frequency */
-                        incperiod = INCPERIOD_24MHZ;
-                        incvalue = INCVALUE_24MHZ;
-                        shift = INCVALUE_SHIFT_24MHZ;
-                        adapter->cc.shift = shift;
-                        break;
-                }
-                return -EINVAL;
+                /* Stable 24MHz frequency */
+                incperiod = INCPERIOD_24MHZ;
+                incvalue = INCVALUE_24MHZ;
+                shift = INCVALUE_SHIFT_24MHZ;
+                adapter->cc.shift = shift;
+                break;
         case e1000_pch_cnp:
                 if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
                         /* Stable 24MHz frequency */
@@ -6876,8 +6854,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
-
         return result;
 }
 
@@ -7614,7 +7590,7 @@ module_exit(e1000_exit_module);
 
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DRV_VERSION);
 
 /* netdev.c */