linux-toradex.git/include/net/ip_vs.h, branch v2.6.39-rc7

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-11T14:27:24+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
  net: Add support for SMSC LAN9530, LAN9730 and LAN89530
  mlx4_en: Restoring RX buffer pointer in case of failure
  mlx4: Sensing link type at device initialization
  ipv4: Fix "Set rt->rt_iif more sanely on output routes."
  MAINTAINERS: add entry for Xen network backend
  be2net: Fix suspend/resume operation
  be2net: Rename some struct members for clarity
  pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
  dsa/mv88e6131: add support for mv88e6085 switch
  ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)
  be2net: Fix a potential crash during shutdown.
  bna: Fix for handling firmware heartbeat failure
  can: mcp251x: Allow pass IRQ flags through platform data.
  smsc911x: fix mac_lock acquision before calling smsc911x_mac_read
  iwlwifi: accept EEPROM version 0x423 for iwl6000
  rt2x00: fix cancelling uninitialized work
  rtlwifi: Fix some warnings/bugs
  p54usb: IDs for two new devices
  wl12xx: fix potential buffer overflow in testmode nvs push
  zd1211rw: reset rx idle timer from tasklet
  ...

IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()

2011-04-04T13:25:18+00:00

ipvsadm -ln --daemon will trigger a Null pointer exception because
ip_vs_genl_dump_daemons() uses skb_net() instead of skb_sknet().

To prevent others from NULL ptr a check is made in ip_vs.h skb_net().

Signed-off-by: Hans Schillstrom 
Signed-off-by: Simon Horman 
Signed-off-by: Patrick McHardy

Fix common misspellings

2011-03-31T14:26:23+00:00

Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi

IPVS: Use global mutex in ip_vs_app.c

2011-03-22T03:39:24+00:00

As part of the work to make IPVS network namespace aware
__ip_vs_app_mutex was replaced by a per-namespace lock,
ipvs->app_mutex. ipvs->app_key is also supplied for debugging purposes.

Unfortunately this implementation results in ipvs->app_key residing
in non-static storage which at the very least causes a lockdep warning.

This patch takes the rather heavy-handed approach of reinstating
__ip_vs_app_mutex which will cover access to the ipvs->list_head
of all network namespaces.

[   12.610000] IPVS: Creating netns size=2456 id=0
[   12.630000] IPVS: Registered protocols (TCP, UDP, SCTP, AH, ESP)
[   12.640000] BUG: key ffff880003bbf1a0 not in .data!
[   12.640000] ------------[ cut here ]------------
[   12.640000] WARNING: at kernel/lockdep.c:2701 lockdep_init_map+0x37b/0x570()
[   12.640000] Hardware name: Bochs
[   12.640000] Pid: 1, comm: swapper Tainted: G        W 2.6.38-kexec-06330-g69b7efe-dirty #122
[   12.650000] Call Trace:
[   12.650000]  [] warn_slowpath_common+0x75/0xb0
[   12.650000]  [] warn_slowpath_null+0x15/0x20
[   12.650000]  [] lockdep_init_map+0x37b/0x570
[   12.650000]  [] ? trace_hardirqs_on+0xd/0x10
[   12.650000]  [] debug_mutex_init+0x38/0x50
[   12.650000]  [] __mutex_init+0x5c/0x70
[   12.650000]  [] __ip_vs_app_init+0x64/0x86
[   12.660000]  [] ? ip_vs_init+0x0/0xff
[   12.660000]  [] T.620+0x43/0x170
[   12.660000]  [] ? register_pernet_subsys+0x1a/0x40
[   12.660000]  [] ? ip_vs_init+0x0/0xff
[   12.660000]  [] ? ip_vs_init+0x0/0xff
[   12.660000]  [] register_pernet_operations+0x57/0xb0
[   12.660000]  [] ? ip_vs_init+0x0/0xff
[   12.670000]  [] register_pernet_subsys+0x29/0x40
[   12.670000]  [] ip_vs_app_init+0x10/0x12
[   12.670000]  [] ip_vs_init+0x4c/0xff
[   12.670000]  [] do_one_initcall+0x7a/0x12e
[   12.670000]  [] kernel_init+0x13e/0x1c2
[   12.670000]  [] kernel_thread_helper+0x4/0x10
[   12.670000]  [] ? restore_args+0x0/0x30
[   12.680000]  [] ? kernel_init+0x0/0x1c2
[   12.680000]  [] ? kernel_thread_helper+0x0/0x1global0

Signed-off-by: Simon Horman 
Cc: Ingo Molnar 
Cc: Eric Dumazet 
Cc: Julian Anastasov 
Cc: Hans Schillstrom 
Signed-off-by: David S. Miller

IPVS: Conditionally include sysctl members of struct netns_ipvs

2011-03-15T00:37:02+00:00

There is now no need to include sysctl members of struct netns_ipvs
unless CONFIG_SYSCTL is defined.

Signed-off-by: Simon Horman

IPVS: Conditional ip_vs_conntrack_enabled()

2011-03-15T00:37:00+00:00

ip_vs_conntrack_enabled() becomes a noop when CONFIG_SYSCTL is undefined.

In preparation for not including sysctl_conntrack in
struct netns_ipvs when CONFIG_SYCTL is not defined.

Signed-off-by: Simon Horman

IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined

2011-03-15T00:36:59+00:00

Signed-off-by: Simon Horman

IPVS: Add sysctl_sync_ver()

2011-03-15T00:36:57+00:00

In preparation for not including sysctl_sync_ver in
struct netns_ipvs when CONFIG_SYCTL is not defined.

Signed-off-by: Simon Horman

IPVS: Add {sysctl_sync_threshold,period}()

2011-03-15T00:36:57+00:00

In preparation for not including sysctl_sync_threshold in
struct netns_ipvs when CONFIG_SYCTL is not defined.

Signed-off-by: Simon Horman

ipvs: rename estimator functions

2011-03-15T00:36:54+00:00

 	Rename ip_vs_new_estimator to ip_vs_start_estimator
and ip_vs_kill_estimator to ip_vs_stop_estimator to better
match their logic.

Signed-off-by: Julian Anastasov 
Signed-off-by: Simon Horman