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

Commit f85fa279 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

parents 358b8382 ea99d832

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

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value); 
#define E1000_DEV_ID_INTEL_CE4100_GBE    0x2E6E



#define NODE_ADDRESS_SIZE 6

#define ETH_LENGTH_OF_ADDRESS 6



/* MAC decode size is 128K - This is the size of BAR0 */

#define MAC_DECODE_SIZE (128 * 1024)

drivers/net/ethernet/intel/e1000e/netdev.c

+215 −173

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
 * e1000_82576

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/types.h>

#include <linux/if_ether.h>
@@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
	 * Check for invalid size

	 */

	if ((hw->mac.type == e1000_82576) && (size > 15)) {

		printk("igb: The NVM size is not valid, "

			"defaulting to 32K.\n");

		pr_notice("The NVM size is not valid, defaulting to 32K\n");

		size = 15;

	}

	nvm->word_size = 1 << size;

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

+80 −85

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/igbvf/netdev.c

+7 −7
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


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



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/types.h>

#include <linux/init.h>
@@ -1746,10 +1748,9 @@ void igbvf_update_stats(struct igbvf_adapter *adapter) 


static void igbvf_print_link_info(struct igbvf_adapter *adapter)

{

	dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s\n",

	dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s Duplex\n",

		 adapter->link_speed,

	         ((adapter->link_duplex == FULL_DUPLEX) ?

	          "Full Duplex" : "Half Duplex"));

		 adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half");

}



static bool igbvf_has_link(struct igbvf_adapter *adapter)
@@ -2843,9 +2844,8 @@ static struct pci_driver igbvf_driver = { 
static int __init igbvf_init_module(void)

{

	int ret;

	printk(KERN_INFO "%s - version %s\n",

	       igbvf_driver_string, igbvf_driver_version);

	printk(KERN_INFO "%s\n", igbvf_copyright);

	pr_info("%s - version %s\n", igbvf_driver_string, igbvf_driver_version);

	pr_info("%s\n", igbvf_copyright);



	ret = pci_register_driver(&igbvf_driver);