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

Commit 787cb2a9 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

parents 2f3a081e 441e1719

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2731,14 +2731,14 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, 
			netdev->addr_len);

			netdev->addr_len);

	}

	}





	if (!is_valid_ether_addr(netdev->perm_addr)) {

	if (!is_valid_ether_addr(netdev->dev_addr)) {

		dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",

		dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",

		        netdev->dev_addr);

		        netdev->dev_addr);

		err = -EIO;

		err = -EIO;

		goto err_hw_init;

		goto err_hw_init;

	}

	}





	memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);

	memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);





	setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,

	setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,

	            (unsigned long) adapter);

	            (unsigned long) adapter);

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -437,6 +437,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, 
	 */

	 */

	if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&

	if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&

	    (fctl & FC_FC_END_SEQ)) {

	    (fctl & FC_FC_END_SEQ)) {

		skb_linearize(skb);

		crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));

		crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));

		crc->fcoe_eof = FC_EOF_T;

		crc->fcoe_eof = FC_EOF_T;

	}

	}

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -4873,10 +4873,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
	}

	}





	ixgbe_clear_interrupt_scheme(adapter);

	ixgbe_clear_interrupt_scheme(adapter);

#ifdef CONFIG_DCB

	kfree(adapter->ixgbe_ieee_pfc);

	kfree(adapter->ixgbe_ieee_ets);

#endif





#ifdef CONFIG_PM

#ifdef CONFIG_PM

	retval = pci_save_state(pdev);

	retval = pci_save_state(pdev);
@@ -7224,6 +7220,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 




	ixgbe_release_hw_control(adapter);

	ixgbe_release_hw_control(adapter);





#ifdef CONFIG_DCB

	kfree(adapter->ixgbe_ieee_pfc);

	kfree(adapter->ixgbe_ieee_ets);



#endif

	iounmap(adapter->hw.hw_addr);

	iounmap(adapter->hw.hw_addr);

	pci_release_selected_regions(pdev, pci_select_bars(pdev,

	pci_release_selected_regions(pdev, pci_select_bars(pdev,

				     IORESOURCE_MEM));

				     IORESOURCE_MEM));