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

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

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

parents e0985f27 310e5ca8

drivers/net/e1000/e1000_hw.c

+3 −1
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw) 
	case M88E1000_I_PHY_ID:

	case M88E1011_I_PHY_ID:

	case M88E1111_I_PHY_ID:

	case M88E1118_E_PHY_ID:

		hw->phy_type = e1000_phy_m88;

		break;

	case IGP01E1000_I_PHY_ID:
@@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw) 
		break;

	case e1000_ce4100:

		if ((hw->phy_id == RTL8211B_PHY_ID) ||

		    (hw->phy_id == RTL8201N_PHY_ID))

		    (hw->phy_id == RTL8201N_PHY_ID) ||

		    (hw->phy_id == M88E1118_E_PHY_ID))

			match = true;

		break;

	case e1000_82541:

drivers/net/e1000/e1000_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -2917,6 +2917,7 @@ struct e1000_host_command_info { 
#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID

#define M88E1011_I_REV_4   0x04

#define M88E1111_I_PHY_ID  0x01410CC0

#define M88E1118_E_PHY_ID  0x01410E40

#define L1LXT971A_PHY_ID   0x001378E0



#define RTL8211B_PHY_ID    0x001CC910

drivers/net/e1000e/netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -4309,7 +4309,6 @@ static void e1000_watchdog_task(struct work_struct *work) 
			 * to get done, so reset controller to flush Tx.

			 * (Do the reset outside of interrupt context).

			 */

			adapter->tx_timeout_count++;

			schedule_work(&adapter->reset_task);

			/* return immediately since reset is imminent */

			return;

drivers/net/ixgbe/ixgbe_common.c

+3 −0
Original line number Diff line number Diff line
@@ -1370,6 +1370,9 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw) 
		hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);



		hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);



		/*  clear VMDq pool/queue selection for RAR 0 */

		hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);

	}

	hw->addr_ctrl.overflow_promisc = 0;

drivers/net/ixgbe/ixgbe_fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid, 
	unsigned int thisoff = 0;

	unsigned int thislen = 0;

	u32 fcbuff, fcdmarw, fcfltrw;

	dma_addr_t addr;

	dma_addr_t addr = 0;



	if (!netdev || !sgl)

		return 0;