Commit fbd01410 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:
 "The iwlwifi firmware compat fix is in here as well as some other
  stuff:

  1) Fix request socket leak introduced by BPF deadlock fix, from Eric
     Dumazet.

  2) Fix VLAN handling with TXQs in mac80211, from Johannes Berg.

  3) Missing __qdisc_drop conversions in prio and qfq schedulers, from
     Gao Feng.

  4) Use after free in netlink nlk groups handling, from Xin Long.

  5) Handle MTU update properly in ipv6 gre tunnels, from Xin Long.

  6) Fix leak of ipv6 fib tables on netns teardown, from Sabrina Dubroca
     with follow-on fix from Eric Dumazet.

  7) Need RCU and preemption disabled during generic XDP data patch,
     from John Fastabend"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  bpf: make error reporting in bpf_warn_invalid_xdp_action more clear
  Revert "mdio_bus: Remove unneeded gpiod NULL check"
  bpf: devmap, use cond_resched instead of cpu_relax
  bpf: add support for sockmap detach programs
  net: rcu lock and preempt disable missing around generic xdp
  bpf: don't select potentially stale ri->map from buggy xdp progs
  net: tulip: Constify tulip_tbl
  net: ethernet: ti: netcp_core: no need in netif_napi_del
  davicom: Display proper debug level up to 6
  net: phy: sfp: rename dt properties to match the binding
  dt-binding: net: sfp binding documentation
  dt-bindings: add SFF vendor prefix
  dt-bindings: net: don't confuse with generic PHY property
  ip6_tunnel: fix setting hop_limit value for ipv6 tunnel
  ip_tunnel: fix setting ttl and tos value in collect_md mode
  ipv6: fix typo in fib6_net_exit()
  tcp: fix a request socket leak
  sctp: fix missing wake ups in some situations
  netfilter: xt_hashlimit: fix build error caused by 64bit division
  netfilter: xt_hashlimit: alloc hashtable with right size
  ...
parents fbf4432f 9beb8bed

Documentation/devicetree/bindings/net/ethernet.txt

+4 −0
Original line number Diff line number Diff line 
The following properties are common to the Ethernet controllers:



NOTE: All 'phy*' properties documented below are Ethernet specific. For the

generic PHY 'phys' property, see

Documentation/devicetree/bindings/phy/phy-bindings.txt.



- local-mac-address: array of 6 bytes, specifies the MAC address that was

  assigned to the network device;

- mac-address: array of 6 bytes, specifies the MAC address that was last used by

Documentation/devicetree/bindings/net/sff,sfp.txt

0 → 100644
+76 −0
Original line number Diff line number Diff line 
Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)

Transceiver



Required properties:



- compatible : must be "sff,sfp"



Optional Properties:



- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial

  interface



- mod-def0-gpios : GPIO phandle and a specifier of the MOD-DEF0 (AKA Mod_ABS)

  module presence input gpio signal, active (module absent) high



- los-gpios : GPIO phandle and a specifier of the Receiver Loss of Signal

  Indication input gpio signal, active (signal lost) high



- tx-fault-gpios : GPIO phandle and a specifier of the Module Transmitter

  Fault input gpio signal, active (fault condition) high



- tx-disable-gpios : GPIO phandle and a specifier of the Transmitter Disable

  output gpio signal, active (Tx disable) high



- rate-select0-gpios : GPIO phandle and a specifier of the Rx Signaling Rate

  Select (AKA RS0) output gpio signal, low: low Rx rate, high: high Rx rate



- rate-select1-gpios : GPIO phandle and a specifier of the Tx Signaling Rate

  Select (AKA RS1) output gpio signal (SFP+ only), low: low Tx rate, high:

  high Tx rate



Example #1: Direct serdes to SFP connection



sfp_eth3: sfp-eth3 {

	compatible = "sff,sfp";

	i2c-bus = <&sfp_1g_i2c>;

	los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>;

	mod-def0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>;

	tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>;

	tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>;

};



&cps_emac3 {

	phy-names = "comphy";

	phys = <&cps_comphy5 0>;

	sfp = <&sfp_eth3>;

};



Example #2: Serdes to PHY to SFP connection



sfp_eth0: sfp-eth0 {

	compatible = "sff,sfp";

	i2c-bus = <&sfpp0_i2c>;

	los-gpios = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>;

	mod-def0-gpios = <&cps_gpio1 27 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&cps_sfpp0_pins>;

	tx-disable-gpios = <&cps_gpio1 29 GPIO_ACTIVE_HIGH>;

	tx-fault-gpios  = <&cps_gpio1 26 GPIO_ACTIVE_HIGH>;

};



p0_phy: ethernet-phy@0 {

	compatible = "ethernet-phy-ieee802.3-c45";

	pinctrl-names = "default";

	pinctrl-0 = <&cpm_phy0_pins &cps_phy0_pins>;

	reg = <0>;

	interrupt = <&cpm_gpio2 18 IRQ_TYPE_EDGE_FALLING>;

	sfp = <&sfp_eth0>;

};



&cpm_eth0 {

	phy = <&p0_phy>;

	phy-mode = "10gbase-kr";

};

Documentation/devicetree/bindings/phy/phy-bindings.txt

+3 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ PHY user node 
=============



Required Properties:

phys : the phandle for the PHY device (used by the PHY subsystem)

phys : the phandle for the PHY device (used by the PHY subsystem; not to be

       confused with the Ethernet specific 'phy' and 'phy-handle' properties,

       see Documentation/devicetree/bindings/net/ethernet.txt for these)

phy-names : the names of the PHY corresponding to the PHYs present in the

	    *phys* phandle

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ schindler Schindler 
seagate	Seagate Technology PLC

semtech	Semtech Corporation

sensirion	Sensirion AG

sff	Small Form Factor Committee

sgx	SGX Sensortech

sharp	Sharp Corporation

si-en	Si-En Technology Ltd.

drivers/isdn/isdnloop/isdnloop.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ isdnloop_sendbuf(int channel, struct sk_buff *skb, isdnloop_card *card) 
		return -EINVAL;

	}

	if (len) {

		if (!(card->flags & (channel) ? ISDNLOOP_FLAGS_B2ACTIVE : ISDNLOOP_FLAGS_B1ACTIVE))

		if (!(card->flags & (channel ? ISDNLOOP_FLAGS_B2ACTIVE : ISDNLOOP_FLAGS_B1ACTIVE)))

			return 0;

		if (card->sndcount[channel] > ISDNLOOP_MAX_SQUEUE)

			return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE