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

Commit 6b15d665 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 negative error code usage in ATM layer, from Stefan Hajnoczi.

 2) If CONFIG_SYSCTL is disabled, the default TTL is not initialized
    properly.  From Ezequiel Garcia.

 3) Missing spinlock init in mvneta driver, from Gregory CLEMENT.

 4) Missing unlocks in hwmb error paths, also from Gregory CLEMENT.

 5) Fix deadlock on team->lock when propagating features, from Ivan
    Vecera.

 6) Work around buffer offset hw bug in alx chips, from Feng Tang.

 7) Fix double listing of SCTP entries in sctp_diag dumps, from Xin
    Long.

 8) Various statistics bug fixes in mlx4 from Eric Dumazet.

 9) Fix some randconfig build errors wrt fou ipv6 from Arnd Bergmann.

10) All of l2tp was namespace aware, but the ipv6 support code was not
    doing so.  From Shmulik Ladkani.

11) Handle on-stack hrtimers properly in pktgen, from Guenter Roeck.

12) Propagate MAC changes properly through VLAN devices, from Mike
    Manning.

13) Fix memory leak in bnx2x_init_one(), from Vitaly Kuznetsov.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
  sfc: Track RPS flow IDs per channel instead of per function
  usbnet: smsc95xx: fix link detection for disabled autonegotiation
  virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv
  bnx2x: avoid leaking memory on bnx2x_init_one() failures
  fou: fix IPv6 Kconfig options
  openvswitch: update checksum in {push,pop}_mpls
  sctp: sctp_diag should dump sctp socket type
  net: fec: update dirty_tx even if no skb
  vlan: Propagate MAC address to VLANs
  atm: iphase: off by one in rx_pkt()
  atm: firestream: add more reserved strings
  vxlan: Accept user specified MTU value when create new vxlan link
  net: pktgen: Call destroy_hrtimer_on_stack()
  timer: Export destroy_hrtimer_on_stack()
  net: l2tp: Make l2tp_ip6 namespace aware
  Documentation: ip-sysctl.txt: clarify secure_redirects
  sfc: use flow dissector helpers for aRFS
  ieee802154: fix logic error in ieee802154_llsec_parse_dev_addr
  net: nps_enet: Disable interrupts before napi reschedule
  net/lapb: tuse %*ph to dump buffers
  ...
parents 58c1f995 faf8dcc1

Documentation/networking/dsa/dsa.txt

+10 −7
Original line number Diff line number Diff line
@@ -369,8 +369,6 @@ does not allocate any driver private context space. 
Switch configuration

--------------------



- priv_size: additional size needed by the switch driver for its private context



- tag_protocol: this is to indicate what kind of tagging protocol is supported,

  should be a valid value from the dsa_tag_protocol enum
@@ -416,11 +414,6 @@ PHY devices and link management 
  to the switch port MDIO registers. If unavailable return a negative error

  code.



- poll_link: Function invoked by DSA to query the link state of the switch

  builtin Ethernet PHYs, per port. This function is responsible for calling

  netif_carrier_{on,off} when appropriate, and can be used to poll all ports in a

  single call. Executes from workqueue context.



- adjust_link: Function invoked by the PHY library when a slave network device

  is attached to a PHY device. This function is responsible for appropriately

  configuring the switch port link parameters: speed, duplex, pause based on
@@ -542,6 +535,16 @@ Bridge layer 
Bridge VLAN filtering

---------------------



- port_vlan_filtering: bridge layer function invoked when the bridge gets

  configured for turning on or off VLAN filtering. If nothing specific needs to

  be done at the hardware level, this callback does not need to be implemented.

  When VLAN filtering is turned on, the hardware must be programmed with

  rejecting 802.1Q frames which have VLAN IDs outside of the programmed allowed

  VLAN ID map/rules.  If there is no PVID programmed into the switch port,

  untagged frames must be rejected as well. When turned off the switch must

  accept any 802.1Q frames irrespective of their VLAN ID, and untagged frames are

  allowed.



- port_vlan_prepare: bridge layer function invoked when the bridge prepares the

  configuration of a VLAN on the given port. If the operation is not supported

  by the hardware, this function should return -EOPNOTSUPP to inform the bridge

Documentation/networking/ip-sysctl.txt

+5 −3
Original line number Diff line number Diff line
@@ -1036,15 +1036,17 @@ proxy_arp_pvlan - BOOLEAN 


shared_media - BOOLEAN

	Send(router) or accept(host) RFC1620 shared media redirects.

	Overrides ip_secure_redirects.

	Overrides secure_redirects.

	shared_media for the interface will be enabled if at least one of

	conf/{all,interface}/shared_media is set to TRUE,

	it will be disabled otherwise

	default TRUE



secure_redirects - BOOLEAN

	Accept ICMP redirect messages only for gateways,

	listed in default gateway list.

	Accept ICMP redirect messages only to gateways listed in the

	interface's current gateway list. Even if disabled, RFC1122 redirect

	rules still apply.

	Overridden by shared_media.

	secure_redirects for the interface will be enabled if at least one of

	conf/{all,interface}/secure_redirects is set to TRUE,

	it will be disabled otherwise

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7989,6 +7989,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

S:	Odd Fixes

F:	Documentation/devicetree/bindings/net/

F:	drivers/net/

F:	include/linux/if_*

F:	include/linux/netdevice.h

drivers/atm/firestream.c

+5 −1
Original line number Diff line number Diff line
@@ -181,13 +181,17 @@ static char *res_strings[] = { 
	"reserved 27", 

	"reserved 28", 

	"reserved 29", 

	"reserved 30", 

	"reserved 30", /* FIXME: The strings between 30-40 might be wrong. */

	"reassembly abort: no buffers", 

	"receive buffer overflow", 

	"change in GFC", 

	"receive buffer full", 

	"low priority discard - no receive descriptor", 

	"low priority discard - missing end of packet", 

	"reserved 37",

	"reserved 38",

	"reserved 39",

	"reseverd 40",

	"reserved 41", 

	"reserved 42", 

	"reserved 43",

drivers/atm/iphase.c

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int rx_pkt(struct atm_dev *dev) 
	/* make the ptr point to the corresponding buffer desc entry */  

	buf_desc_ptr += desc;	  

        if (!desc || (desc > iadev->num_rx_desc) || 

                      ((buf_desc_ptr->vc_index & 0xffff) > iadev->num_vc)) { 

                      ((buf_desc_ptr->vc_index & 0xffff) >= iadev->num_vc)) {

            free_desc(dev, desc);

            IF_ERR(printk("IA: bad descriptor desc = %d \n", desc);)

            return -1;