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

Commit 4fc3acf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking updates from David Miller:

 1) Make syn floods consume significantly less resources by

    a) Not pre-COW'ing routing metrics for SYN/ACKs
    b) Mirroring the device queue mapping of the SYN for the SYN/ACK
       reply.

    Both from Eric Dumazet.

 2) Fix calculation errors in Byte Queue Limiting, from Hiroaki SHIMODA.

 3) Validate the length requested when building a paged SKB for a
    socket, so we don't overrun the page vector accidently.  From Jason
    Wang.

 4) When netlabel is disabled, we abort all IP option processing when we
    see a CIPSO option.  This isn't the right thing to do, we should
    simply skip over it and continue processing the remaining options
    (if any).  Fix from Paul Moore.

 5) SRIOV fixes for the mellanox driver from Jack orgenstein and Marcel
    Apfelbaum.

 6) 8139cp enables the receiver before the ring address is properly
    programmed, which potentially lets the device crap over random
    memory.  Fix from Jason Wang.

 7) e1000/e1000e fixes for i217 RST handling, and an improper buffer
    address reference in jumbo RX frame processing from Bruce Allan and
    Sebastian Andrzej Siewior, respectively.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  fec_mpc52xx: fix timestamp filtering
  mcs7830: Implement link state detection
  e1000e: fix Rapid Start Technology support for i217
  e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats()
  r8169: call netif_napi_del at errpaths and at driver unload
  tcp: reflect SYN queue_mapping into SYNACK packets
  tcp: do not create inetpeer on SYNACK message
  8139cp/8139too: terminate the eeprom access with the right opmode
  8139cp: set ring address before enabling receiver
  cipso: handle CIPSO options correctly when NetLabel is disabled
  net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()
  bql: Avoid possible inconsistent calculation.
  bql: Avoid unneeded limit decrement.
  bql: Fix POSDIFF() to integer overflow aware.
  net/mlx4_core: Fix obscure mlx4_cmd_box parameter in QUERY_DEV_CAP
  net/mlx4_core: Check port out-of-range before using in mlx4_slave_cap
  net/mlx4_core: Fixes for VF / Guest startup flow
  net/mlx4_en: Fix improper use of "port" parameter in mlx4_en_event
  net/mlx4_core: Fix number of EQs used in ICM initialisation
  net/mlx4_core: Fix the slave_id out-of-range test in mlx4_eq_int
parents 63004afa 9ca3cc6f

drivers/net/ethernet/freescale/fec_mpc52xx.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) 
		length = status & BCOM_FEC_RX_BD_LEN_MASK;

		skb_put(rskb, length - 4);	/* length without CRC32 */

		rskb->protocol = eth_type_trans(rskb, dev);

		if (!skb_defer_rx_timestamp(skb))

		if (!skb_defer_rx_timestamp(rskb))

			netif_rx(rskb);



		spin_lock(&priv->lock);

drivers/net/ethernet/intel/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4080,7 +4080,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, 
				spin_lock_irqsave(&adapter->stats_lock,

				                  irq_flags);

				e1000_tbi_adjust_stats(hw, &adapter->stats,

				                       length, skb->data);

						       length, mapped);

				spin_unlock_irqrestore(&adapter->stats_lock,

				                       irq_flags);

				length--;

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

+9 −9
Original line number Diff line number Diff line
@@ -165,14 +165,14 @@ 
#define I217_EEE_100_SUPPORTED  (1 << 1)	/* 100BaseTx EEE supported */



/* Intel Rapid Start Technology Support */

#define I217_PROXY_CTRL                 PHY_REG(BM_WUC_PAGE, 70)

#define I217_PROXY_CTRL                 BM_PHY_REG(BM_WUC_PAGE, 70)

#define I217_PROXY_CTRL_AUTO_DISABLE    0x0080

#define I217_SxCTRL                     PHY_REG(BM_PORT_CTRL_PAGE, 28)

#define I217_SxCTRL_MASK                0x1000

#define I217_SxCTRL_ENABLE_LPI_RESET    0x1000

#define I217_CGFREG                     PHY_REG(772, 29)

#define I217_CGFREG_MASK                0x0002

#define I217_CGFREG_ENABLE_MTA_RESET    0x0002

#define I217_MEMPWR                     PHY_REG(772, 26)

#define I217_MEMPWR_MASK                0x0010

#define I217_MEMPWR_DISABLE_SMB_RELEASE 0x0010



/* Strapping Option Register - RO */

#define E1000_STRAP                     0x0000C
@@ -4089,12 +4089,12 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw) 
			 * power good.

			 */

			e1e_rphy_locked(hw, I217_SxCTRL, &phy_reg);

			phy_reg |= I217_SxCTRL_MASK;

			phy_reg |= I217_SxCTRL_ENABLE_LPI_RESET;

			e1e_wphy_locked(hw, I217_SxCTRL, phy_reg);



			/* Disable the SMB release on LCD reset. */

			e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);

			phy_reg &= ~I217_MEMPWR;

			phy_reg &= ~I217_MEMPWR_DISABLE_SMB_RELEASE;

			e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);

		}
@@ -4103,7 +4103,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw) 
		 * Support

		 */

		e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);

		phy_reg |= I217_CGFREG_MASK;

		phy_reg |= I217_CGFREG_ENABLE_MTA_RESET;

		e1e_wphy_locked(hw, I217_CGFREG, phy_reg);



release:
@@ -4176,7 +4176,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw) 
			ret_val = e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);

			if (ret_val)

				goto release;

			phy_reg |= I217_MEMPWR_MASK;

			phy_reg |= I217_MEMPWR_DISABLE_SMB_RELEASE;

			e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);



			/* Disable Proxy */
@@ -4186,7 +4186,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw) 
		ret_val = e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);

		if (ret_val)

			goto release;

		phy_reg &= ~I217_CGFREG_MASK;

		phy_reg &= ~I217_CGFREG_ENABLE_MTA_RESET;

		e1e_wphy_locked(hw, I217_CGFREG, phy_reg);

release:

		if (ret_val)

drivers/net/ethernet/mellanox/mlx4/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static struct mlx4_cmd_info cmd_info[] = { 
		.out_is_imm = false,

		.encode_slave_id = false,

		.verify = NULL,

		.wrapper = NULL

		.wrapper = mlx4_QUERY_FW_wrapper

	},

	{

		.opcode = MLX4_CMD_QUERY_HCA,
@@ -635,7 +635,7 @@ static struct mlx4_cmd_info cmd_info[] = { 
		.out_is_imm = false,

		.encode_slave_id = false,

		.verify = NULL,

		.wrapper = NULL

		.wrapper = mlx4_QUERY_DEV_CAP_wrapper

	},

	{

		.opcode = MLX4_CMD_QUERY_FUNC_CAP,

drivers/net/ethernet/mellanox/mlx4/en_main.c

+7 −5
Original line number Diff line number Diff line
@@ -136,13 +136,12 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr, 
	struct mlx4_en_dev *mdev = (struct mlx4_en_dev *) endev_ptr;

	struct mlx4_en_priv *priv;



	if (!mdev->pndev[port])

		return;



	priv = netdev_priv(mdev->pndev[port]);

	switch (event) {

	case MLX4_DEV_EVENT_PORT_UP:

	case MLX4_DEV_EVENT_PORT_DOWN:

		if (!mdev->pndev[port])

			return;

		priv = netdev_priv(mdev->pndev[port]);

		/* To prevent races, we poll the link state in a separate

		  task rather than changing it here */

		priv->link_state = event;
@@ -154,7 +153,10 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr, 
		break;



	default:

		mlx4_warn(mdev, "Unhandled event: %d\n", event);

		if (port < 1 || port > dev->caps.num_ports ||

		    !mdev->pndev[port])

			return;

		mlx4_warn(mdev, "Unhandled event %d for port %d\n", event, port);

	}

}