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

Commit 2decb268 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) mlx4 doesn't check fully for supported valid RSS hash function, fix
    from Amir Vadai

 2) Off by one in ibmveth_change_mtu(), from David Gibson

 3) Prevent altera chip from reporting false error interrupts in some
    circumstances, from Chee Nouk Phoon

 4) Get rid of that stupid endless loop trying to allocate a FIN packet
    in TCP, and in the process kill deadlocks.  From Eric Dumazet

 5) Fix get_rps_cpus() crash due to wrong invalid-cpu value, also from
    Eric Dumazet

 6) Fix two bugs in async rhashtable resizing, from Thomas Graf

 7) Fix topology server listener socket namespace bug in TIPC, from Ying
    Xue

 8) Add some missing HAS_DMA kconfig dependencies, from Geert
    Uytterhoeven

 9) bgmac driver intends to force re-polling but does so by returning
    the wrong value from it's ->poll() handler.  Fix from Rafał Miłecki

10) When the creater of an rhashtable configures a max size for it,
    don't bark in the logs and drop insertions when that is exceeded.
    Fix from Johannes Berg

11) Recover from out of order packets in ppp mppe properly, from Sylvain
    Rochet

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
  bnx2x: really disable TPA if 'disable_tpa' option is set
  net:treewide: Fix typo in drivers/net
  net/mlx4_en: Prevent setting invalid RSS hash function
  mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions
  netfilter; Add some missing default cases to switch statements in nft_reject.
  ppp: mppe: discard late packet in stateless mode
  ppp: mppe: sanity error path rework
  net/bonding: Make DRV macros private
  net: rfs: fix crash in get_rps_cpus()
  altera tse: add support for fixed-links.
  pxa168: fix double deallocation of managed resources
  net: fix crash in build_skb()
  net: eth: altera: Resolve false errors from MSGDMA to TSE
  ehea: Fix memory hook reference counting crashes
  net/tg3: Release IRQs on permanent error
  net: mdio-gpio: support access that may sleep
  inet: fix possible panic in reqsk_queue_unlink()
  rhashtable: don't attempt to grow when at max_size
  bgmac: fix requests for extra polling calls from NAPI
  tcp: avoid looping in tcp_send_fin()
  ...
parents b787f68c 22a8f237

Documentation/networking/mpls-sysctl.txt

+9 −0
Original line number Diff line number Diff line
@@ -18,3 +18,12 @@ platform_labels - INTEGER 


	Possible values: 0 - 1048575

	Default: 0



conf/<interface>/input - BOOL

	Control whether packets can be input on this interface.



	If disabled, packets will be discarded without further

	processing.



	0 - disabled (default)

	not 0 - enabled

Documentation/networking/scaling.txt

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ following is true: 


- The current CPU's queue head counter >= the recorded tail counter

  value in rps_dev_flow[i]

- The current CPU is unset (equal to RPS_NO_CPU)

- The current CPU is unset (>= nr_cpu_ids)

- The current CPU is offline



After this check, the packet is sent to the (possibly updated) current

drivers/net/bonding/bond_main.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
#include <net/bond_3ad.h>

#include <net/bond_alb.h>



#include "bonding_priv.h"



/*---------------------------- Module parameters ----------------------------*/



/* monitor all links that often (in milliseconds). <=0 disables monitoring */

drivers/net/bonding/bond_procfs.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <net/netns/generic.h>

#include <net/bonding.h>



#include "bonding_priv.h"



static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(RCU)

drivers/net/bonding/bonding_priv.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.

 *

 * Portions are (c) Copyright 1995 Simon "Guru Aleph-Null" Janes

 * NCM: Network and Communications Management, Inc.

 *

 * BUT, I'm the one who modified it for ethernet, so:

 * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov

 *

 *	This software may be used and distributed according to the terms

 *	of the GNU Public License, incorporated herein by reference.

 *

 */



#ifndef _BONDING_PRIV_H

#define _BONDING_PRIV_H



#define DRV_VERSION	"3.7.1"

#define DRV_RELDATE	"April 27, 2011"

#define DRV_NAME	"bonding"

#define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"



#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"



#endif