Commit a3958f5e 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:
 "Fixes all over:

   1) Netdev refcnt leak in nf_flow_table, from Taehee Yoo.

   2) Fix RCU usage in nf_tables, from Florian Westphal.

   3) Fix DSA build when NET_DSA_TAG_BRCM_PREPEND is not set, from Yue
      Haibing.

   4) Add missing page read/write ops to realtek driver, from Heiner
      Kallweit.

   5) Endianness fix in qrtr code, from Nicholas Mc Guire.

   6) Fix various bugs in DSA_SKB_* macros, from Vladimir Oltean.

   7) Several BPF documentation cures, from Quentin Monnet.

   8) Fix undefined behavior in narrow load handling of BPF verifier,
      from Krzesimir Nowak.

   9) DMA ops crash in SGI Seeq driver due to not set netdev parent
      device pointer, from Thomas Bogendoerfer.

  10) Flow dissector has to disable preemption when invoking BPF
      program, from Eric Dumazet"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits)
  net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering
  net: ethernet: ti: netcp_ethss: fix build
  flow_dissector: disable preemption around BPF calls
  bonding: fix arp_validate toggling in active-backup mode
  net: meson: fixup g12a glue ephy id
  net: phy: realtek: Replace phy functions with non-locked version in rtl8211e_config_init()
  net: seeq: fix crash caused by not set dev.parent
  of_net: Fix missing of_find_device_by_node ref count drop
  net: mvpp2: cls: Add missing NETIF_F_NTUPLE flag
  bpf: fix undefined behavior in narrow load handling
  libbpf: detect supported kernel BTF features and sanitize BTF
  selftests: bpf: Add files generated after build to .gitignore
  tools: bpf: synchronise BPF UAPI header with tools
  bpf: fix minor issues in documentation for BPF helpers.
  bpf: fix recurring typo in documentation for BPF helpers
  bpf: fix script for generating man page on BPF helpers
  bpf: add various test cases for backward jumps
  net: dccp : proto: remove Unneeded variable "err"
  net: dsa: Remove the now unused DSA_SKB_CB_COPY() macro
  net: dsa: Remove dangerous DSA_SKB_CLONE() macro
  ...
parents d4c60811 d4c26eb6

Documentation/devicetree/bindings/net/keystone-netcp.txt

+3 −3
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ Optional properties: 
			sub-module attached to this interface.



The MAC address will be determined using the optional properties defined in

ethernet.txt, as provided by the of_get_mac_address API and only if efuse-mac

is set to 0. If any of the optional MAC address properties are not present,

then the driver will use random MAC address.

ethernet.txt and only if efuse-mac is set to 0. If all of the optional MAC

address properties are not present, then the driver will use a random MAC

address.



Example binding:

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ Optional properties: 
- ieee80211-freq-limit: See ieee80211.txt

- mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data



The driver is using of_get_mac_address API, so the MAC address can be as well

be set with corresponding optional properties defined in net/ethernet.txt.

The MAC address can as well be set with corresponding optional properties

defined in net/ethernet.txt.



Optional nodes:

- led: Properties for a connected LED

arch/powerpc/sysdev/tsi108_dev.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/irq.h>

#include <linux/export.h>

#include <linux/device.h>

#include <linux/etherdevice.h>

#include <linux/platform_device.h>

#include <linux/of_net.h>

#include <asm/tsi108.h>
@@ -106,7 +107,7 @@ static int __init tsi108_eth_of_init(void) 


		mac_addr = of_get_mac_address(np);

		if (!IS_ERR(mac_addr))

			memcpy(tsi_eth_data.mac_addr, mac_addr, 6);

			ether_addr_copy(tsi_eth_data.mac_addr, mac_addr);



		ph = of_get_property(np, "mdio-handle", NULL);

		mdio = of_find_node_by_phandle(*ph);

drivers/net/bonding/bond_options.c

+0 −7
Original line number Diff line number Diff line
@@ -1098,13 +1098,6 @@ static int bond_option_arp_validate_set(struct bonding *bond, 
{

	netdev_dbg(bond->dev, "Setting arp_validate to %s (%llu)\n",

		   newval->string, newval->value);



	if (bond->dev->flags & IFF_UP) {

		if (!newval->value)

			bond->recv_probe = NULL;

		else if (bond->params.arp_interval)

			bond->recv_probe = bond_arp_rcv;

	}

	bond->params.arp_validate = newval->value;



	return 0;

drivers/net/ethernet/allwinner/sun4i-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static int emac_probe(struct platform_device *pdev) 
	/* Read MAC-address from DT */

	mac_addr = of_get_mac_address(np);

	if (!IS_ERR(mac_addr))

		memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);

		ether_addr_copy(ndev->dev_addr, mac_addr);



	/* Check if the MAC address is valid, if not get a random one */

	if (!is_valid_ether_addr(ndev->dev_addr)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE