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

Commit 388f9976 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 verifier memory corruption and other bugs in BPF layer, from
    Alexei Starovoitov.

 2) Add a conservative fix for doing BPF properly in the BPF classifier
    of the packet scheduler on ingress.  Also from Alexei.

 3) The SKB scrubber should not clear out the packet MARK and security
    label, from Herbert Xu.

 4) Fix oops on rmmod in stmmac driver, from Bryan O'Donoghue.

 5) Pause handling is not correct in the stmmac driver because it
    doesn't take into consideration the RX and TX fifo sizes.  From
    Vince Bridgers.

 6) Failure path missing unlock in FOU driver, from Wang Cong.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
  net: dsa: use DEVICE_ATTR_RW to declare temp1_max
  netns: remove BUG_ONs from net_generic()
  IB/ipoib: Fix ndo_get_iflink
  sfc: Fix memcpy() with const destination compiler warning.
  altera tse: Fix network-delays and -retransmissions after high throughput.
  net: remove unused 'dev' argument from netif_needs_gso()
  act_mirred: Fix bogus header when redirecting from VLAN
  inet_diag: fix access to tcp cc information
  tcp: tcp_get_info() should fetch socket fields once
  net: dsa: mv88e6xxx: Add missing initialization in mv88e6xxx_set_port_state()
  skbuff: Do not scrub skb mark within the same name space
  Revert "net: Reset secmark when scrubbing packet"
  bpf: fix two bugs in verification logic when accessing 'ctx' pointer
  bpf: fix bpf helpers to use skb->mac_header relative offsets
  stmmac: Configure Flow Control to work correctly based on rxfifo size
  stmmac: Enable unicast pause frame detect in GMAC Register 6
  stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree
  stmmac: Add defines and documentation for enabling flow control
  stmmac: Add properties for transmit and receive fifo sizes
  stmmac: fix oops on rmmod after assigning ip addr
  ...
parents e2fdae7e e3122b7f

Documentation/devicetree/bindings/net/ethernet.txt

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ The following properties are common to the Ethernet controllers: 
- phy: the same as "phy-handle" property, not recommended for new bindings.

- phy-device: the same as "phy-handle" property, not recommended for new

  bindings.

- rx-fifo-depth: the size of the controller's receive fifo in bytes. This

  is used for components that can have configurable receive fifo sizes,

  and is useful for determining certain configuration settings such as

  flow control thresholds.

- tx-fifo-depth: the size of the controller's transmit fifo in bytes. This

  is used for components that can have configurable fifo sizes.



Child nodes of the Ethernet controller are typically the individual PHY devices

connected via the MDIO bus (sometimes the MDIO bus controller is separate).

Documentation/devicetree/bindings/net/stmmac.txt

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ Optional properties: 
  If not passed then the system clock will be used and this is fine on some

  platforms.

- snps,burst_len: The AXI burst lenth value of the AXI BUS MODE register.

- tx-fifo-depth: See ethernet.txt file in the same directory

- rx-fifo-depth: See ethernet.txt file in the same directory



Examples:
@@ -59,6 +61,8 @@ Examples: 
		phy-mode = "gmii";

		snps,multicast-filter-bins = <256>;

		snps,perfect-filter-entries = <128>;

		rx-fifo-depth = <16384>;

		tx-fifo-depth = <16384>;

		clocks = <&clock>;

		clock-names = "stmmaceth";

	};

drivers/infiniband/hw/cxgb4/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int _c4iw_write_mem_dma_aligned(struct c4iw_rdev *rdev, u32 addr, 
		c4iw_init_wr_wait(&wr_wait);

	wr_len = roundup(sizeof(*req) + sizeof(*sgl), 16);



	skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);

	skb = alloc_skb(wr_len, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;

	set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+5 −0
Original line number Diff line number Diff line
@@ -846,6 +846,11 @@ static int ipoib_get_iflink(const struct net_device *dev) 
{

	struct ipoib_dev_priv *priv = netdev_priv(dev);



	/* parent interface */

	if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))

		return dev->ifindex;



	/* child/vlan interface */

	return priv->parent->ifindex;

}

drivers/infiniband/ulp/ipoib/ipoib_vlan.c

+1 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, 
	/* MTU will be reset when mcast join happens */

	priv->dev->mtu   = IPOIB_UD_MTU(priv->max_ib_mtu);

	priv->mcast_mtu  = priv->admin_mtu = priv->dev->mtu;

	priv->parent = ppriv->dev;

	set_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags);



	result = ipoib_set_dev_features(priv, ppriv->ca);
@@ -84,8 +85,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, 
		goto register_failed;

	}



	priv->parent = ppriv->dev;



	ipoib_create_debug_files(priv->dev);



	/* RTNL childs don't need proprietary sysfs entries */