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

Commit b531f5dd 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:

 1) Fix skb leak in mac802154, from Martin Townsend

 2) Use select not depends on NF_NAT for NFT_NAT, from Pablo Neira
    Ayuso

 3) Fix union initializer bogosity in vxlan, from Gerhard Stenzel

 4) Fix RX checksum configuration in stmmac driver, from Giuseppe
    CAVALLARO

 5) Fix TSO with non-accelerated VLANs in e1000, e1000e, bna, ehea,
    i40e, i40evf, mvneta, and qlge, from Vlad Yasevich

 6) Fix capability checks in phy_init_eee(), from Giuseppe CAVALLARO

 7) Try high order allocations more sanely for SKBs, specifically if a
    high order allocation fails, fall back directly to zero order pages
    rather than iterating down one order at a time.  From Eric Dumazet

 8) Fix a memory leak in openvswitch, from Li RongQing

 9) amd-xgbe initializes wrong spinlock, from Thomas Lendacky

10) RTNL locking was busted in setsockopt for anycast and multicast, fix
    from Sabrina Dubroca

11) Fix peer address refcount leak in ipv6, from Nicolas Dichtel

12) DocBook typo fixes, from Masanari Iida

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (101 commits)
  ipv6: restore the behavior of ipv6_sock_ac_drop()
  amd-xgbe: Enable interrupts for all management counters
  amd-xgbe: Treat certain counter registers as 64 bit
  greth: moved TX ring cleaning to NAPI rx poll func
  cnic : Cleanup CONFIG_IPV6 & VLAN check
  net: treewide: Fix typo found in DocBook/networking.xml
  bnx2x: Fix link problems for 1G SFP RJ45 module
  3c59x: avoid panic in boomerang_start_xmit when finding page address:
  netfilter: add explicit Kconfig for NETFILTER_XT_NAT
  ipv6: use addrconf_get_prefix_route() to remove peer addr
  ipv6: fix a refcnt leak with peer addr
  net-timestamp: only report sw timestamp if reporting bit is set
  drivers/net/fddi/skfp/h/skfbi.h: Remove useless PCI_BASE_2ND macros
  l2tp: fix race while getting PMTU on PPP pseudo-wire
  ipv6: fix rtnl locking in setsockopt for anycast and multicast
  VMXNET3: Check for map error in vmxnet3_set_mc
  openvswitch: distinguish between the dropped and consumed skb
  amd-xgbe: Fix initialization of the wrong spin lock
  openvswitch: fix a memory leak
  netfilter: fix missing dependencies in NETFILTER_XT_TARGET_LOG
  ...
parents 2ce7598c 45ce829d

Documentation/devicetree/bindings/net/stmmac.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Optional properties: 
  further clocks may be specified in derived bindings.

- clock-names: One name for each entry in the clocks property, the

  first one should be "stmmaceth".

- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is

  available this clock is used for programming the Timestamp Addend Register.

  If not passed then the system clock will be used and this is fine on some

  platforms.



Examples:

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xA8DB */

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

drivers/infiniband/hw/mlx4/main.c

+30 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,30 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id) 
	return err;

}



static int mlx4_ib_tunnel_steer_add(struct ib_qp *qp, struct ib_flow_attr *flow_attr,

				    u64 *reg_id)

{

	void *ib_flow;

	union ib_flow_spec *ib_spec;

	struct mlx4_dev	*dev = to_mdev(qp->device)->dev;

	int err = 0;



	if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)

		return 0; /* do nothing */



	ib_flow = flow_attr + 1;

	ib_spec = (union ib_flow_spec *)ib_flow;



	if (ib_spec->type !=  IB_FLOW_SPEC_ETH || flow_attr->num_of_specs != 1)

		return 0; /* do nothing */



	err = mlx4_tunnel_steer_add(to_mdev(qp->device)->dev, ib_spec->eth.val.dst_mac,

				    flow_attr->port, qp->qp_num,

				    MLX4_DOMAIN_UVERBS | (flow_attr->priority & 0xff),

				    reg_id);

	return err;

}



static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,

				    struct ib_flow_attr *flow_attr,

				    int domain)
@@ -1136,6 +1160,12 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
		i++;

	}



	if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		err = mlx4_ib_tunnel_steer_add(qp, flow_attr, &mflow->reg_id[i]);

		if (err)

			goto err_free;

	}



	return &mflow->ibflow;



err_free:

drivers/infiniband/hw/mlx4/qp.c

+7 −1
Original line number Diff line number Diff line
@@ -1677,9 +1677,15 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, 
		}

	}



	if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)

	if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET) {

		context->pri_path.ackto = (context->pri_path.ackto & 0xf8) |

					MLX4_IB_LINK_TYPE_ETH;

		if (dev->dev->caps.tunnel_offload_mode ==  MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {

			/* set QP to receive both tunneled & non-tunneled packets */

			if (!(context->flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET)))

				context->srqn = cpu_to_be32(7 << 28);

		}

	}



	if (ibqp->qp_type == IB_QPT_UD && (new_state == IB_QPS_RTR)) {

		int is_eth = rdma_port_get_link_layer(

drivers/net/ethernet/3com/3c59x.c

+4 −4
Original line number Diff line number Diff line
@@ -2177,10 +2177,10 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];



			vp->tx_ring[entry].frag[i+1].addr =

					cpu_to_le32(pci_map_single(

						VORTEX_PCI(vp),

						(void *)skb_frag_address(frag),

						skb_frag_size(frag), PCI_DMA_TODEVICE));

					cpu_to_le32(skb_frag_dma_map(

						&VORTEX_PCI(vp)->dev,

						frag,

						frag->page_offset, frag->size, DMA_TO_DEVICE));



			if (i == skb_shinfo(skb)->nr_frags-1)

					vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(skb_frag_size(frag)|LAST_FRAG);