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

Commit 8e845971 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:
 "Several small fixes here:

   1) Don't crash in tg3 driver when the number of tx queues has been
      configured to be different from the number of rx queues.  From
      Thadeu Lima de Souza Cascardo.

   2) VLAN filter not disabled properly in promisc mode in ixgbe driver,
      from Vlad Yasevich.

   3) Fix OOPS on dellink op in VTI tunnel driver, from Xin Long.

   4) IPV6 GRE driver WCCP code checks skb->protocol for ETH_P_IP
      instead of ETH_P_IPV6, whoops.  From Yuri Chislov.

   5) Socket matching in ping driver is buggy when packet AF does not
      match socket's AF.  Fix from Jane Zhou.

   6) Fix checksum calculation errors in VXLAN due to where the
      udp_tunnel6_xmit_skb() helper gets it's saddr/daddr from.  From
      Alexander Duyck.

   7) Fix 5G detection problem in rtlwifi driver, from Larry Finger.

   8) Fix NULL deref in tcp_v{4,6}_send_reset, from Eric Dumazet.

   9) Various missing netlink attribute verifications in bridging code,
      from Thomas Graf.

  10) tcp_recvmsg() unconditionally calls ipv4 ip_recv_error even for
      ipv6 sockets, whoops.  Fix from Willem de Bruijn"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
  net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
  bridge: Sanitize IFLA_EXT_MASK for AF_BRIDGE:RTM_GETLINK
  bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVE
  net: Check for presence of IFLA_AF_SPEC
  net: Validate IFLA_BRIDGE_MODE attribute length
  bridge: Validate IFLA_BRIDGE_FLAGS attribute length
  stmmac: platform: fix default values of the filter bins setting
  net/mlx4_core: Limit count field to 24 bits in qp_alloc_res
  net: dsa: bcm_sf2: reset switch prior to initialization
  net: dsa: bcm_sf2: fix unmapping registers in case of errors
  tg3: fix ring init when there are more TX than RX channels
  tcp: fix possible NULL dereference in tcp_vX_send_reset()
  rtlwifi: Change order in device startup
  rtlwifi: rtl8821ae: Fix 5G detection problem
  Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse"
  vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX]
  ip6_udp_tunnel: Fix checksum calculation
  net-timestamp: Fix a documentation typo
  net/ping: handle protocol mismatching scenario
  af_packet: fix sparse warning
  ...
parents 190fc9d9 d1c637c5

Documentation/networking/timestamping.txt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID: 


  This option is implemented only for transmit timestamps. There, the

  timestamp is always looped along with a struct sock_extended_err.

  The option modifies field ee_info to pass an id that is unique

  The option modifies field ee_data to pass an id that is unique

  among all possibly concurrently outstanding timestamp requests for

  that socket. In practice, it is a monotonically increasing u32

  (that wraps).

drivers/atm/solos-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1225,11 +1225,13 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	card->config_regs = pci_iomap(dev, 0, CONFIG_RAM_SIZE);

	if (!card->config_regs) {

		dev_warn(&dev->dev, "Failed to ioremap config registers\n");

		err = -ENOMEM;

		goto out_release_regions;

	}

	card->buffers = pci_iomap(dev, 1, DATA_RAM_SIZE);

	if (!card->buffers) {

		dev_warn(&dev->dev, "Failed to ioremap data buffers\n");

		err = -ENOMEM;

		goto out_unmap_config;

	}

drivers/net/dsa/bcm_sf2.c

+33 −25
Original line number Diff line number Diff line
@@ -377,6 +377,29 @@ static irqreturn_t bcm_sf2_switch_1_isr(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv)

{

	unsigned int timeout = 1000;

	u32 reg;



	reg = core_readl(priv, CORE_WATCHDOG_CTRL);

	reg |= SOFTWARE_RESET | EN_CHIP_RST | EN_SW_RESET;

	core_writel(priv, reg, CORE_WATCHDOG_CTRL);



	do {

		reg = core_readl(priv, CORE_WATCHDOG_CTRL);

		if (!(reg & SOFTWARE_RESET))

			break;



		usleep_range(1000, 2000);

	} while (timeout-- > 0);



	if (timeout == 0)

		return -ETIMEDOUT;



	return 0;

}



static int bcm_sf2_sw_setup(struct dsa_switch *ds)

{

	const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME;
@@ -404,11 +427,18 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
		*base = of_iomap(dn, i);

		if (*base == NULL) {

			pr_err("unable to find register: %s\n", reg_names[i]);

			return -ENODEV;

			ret = -ENOMEM;

			goto out_unmap;

		}

		base++;

	}



	ret = bcm_sf2_sw_rst(priv);

	if (ret) {

		pr_err("unable to software reset switch: %d\n", ret);

		goto out_unmap;

	}



	/* Disable all interrupts and request them */

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);
@@ -484,6 +514,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
out_unmap:

	base = &priv->core;

	for (i = 0; i < BCM_SF2_REGS_NUM; i++) {

		if (*base)

			iounmap(*base);

		base++;

	}
@@ -733,29 +764,6 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) 
	return 0;

}



static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv)

{

	unsigned int timeout = 1000;

	u32 reg;



	reg = core_readl(priv, CORE_WATCHDOG_CTRL);

	reg |= SOFTWARE_RESET | EN_CHIP_RST | EN_SW_RESET;

	core_writel(priv, reg, CORE_WATCHDOG_CTRL);



	do {

		reg = core_readl(priv, CORE_WATCHDOG_CTRL);

		if (!(reg & SOFTWARE_RESET))

			break;



		usleep_range(1000, 2000);

	} while (timeout-- > 0);



	if (timeout == 0)

		return -ETIMEDOUT;



	return 0;

}



static int bcm_sf2_sw_resume(struct dsa_switch *ds)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

drivers/net/ethernet/broadcom/tg3.c

+2 −1
Original line number Diff line number Diff line
@@ -8563,7 +8563,8 @@ static int tg3_init_rings(struct tg3 *tp) 
		if (tnapi->rx_rcb)

			memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));



		if (tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {

		if (tnapi->prodring.rx_std &&

		    tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {

			tg3_free_rings(tp);

			return -ENOMEM;

		}

drivers/net/ethernet/emulex/benet/be_main.c

+5 −0
Original line number Diff line number Diff line
@@ -4309,11 +4309,16 @@ static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh) 
		return -EOPNOTSUPP;



	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	if (!br_spec)

		return -EINVAL;



	nla_for_each_nested(attr, br_spec, rem) {

		if (nla_type(attr) != IFLA_BRIDGE_MODE)

			continue;



		if (nla_len(attr) < sizeof(mode))

			return -EINVAL;



		mode = nla_get_u16(attr);

		if (mode != BRIDGE_MODE_VEPA && mode != BRIDGE_MODE_VEB)

			return -EINVAL;