linux.git/net/ipv6/netfilter, branch v2.6.29-rc2

netfilter 06/09: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian

2009-01-13T05:18:35+00:00

An old bug crept back into the ICMP/ICMPv6 conntrack protocols: the timeout
values are defined as unsigned longs, the sysctl's maxsize is set to
sizeof(unsigned int). Use unsigned int for the timeout values as in the
other conntrack protocols.

Reported-by: Jean-Mickael Guerin 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

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

2008-12-28T20:49:40+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2008-11-28T10:19:15+00:00

Conflicts:

	net/netfilter/nf_conntrack_netlink.c

netns xfrm: lookup in netns

2008-11-26T01:35:18+00:00

Pass netns to xfrm_lookup()/__xfrm_lookup(). For that pass netns
to flow_cache_lookup() and resolver callback.

Take it from socket or netdevice. Stub DECnet to init_net.

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller

netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks

2008-11-20T08:58:08+00:00

Signed-off-by: Alexey Dobriyan 
Signed-off-by: Patrick McHardy

CRED: Use creds in file structs

2008-11-13T23:39:25+00:00

Attach creds to file structs and discard f_uid/f_gid.

file_operations::open() methods (such as hppfs_open()) should use file->f_cred
rather than current_cred().  At the moment file->f_cred will be current_cred()
at this point.

Signed-off-by: David Howells 
Reviewed-by: James Morris 
Signed-off-by: James Morris

net: '&' redux

2008-11-04T02:21:05+00:00

I want to compile out proc_* and sysctl_* handlers totally and
stub them to NULL depending on config options, however usage of &
will prevent this, since taking adress of NULL pointer will break
compilation.

So, drop & in front of every ->proc_handler and every ->strategy
handler, it was never needed in fact.

Signed-off-by: Alexey Dobriyan 
Signed-off-by: David S. Miller

net: replace NIPQUAD() in net/ipv4/ net/ipv6/

2008-10-31T07:53:57+00:00

Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4

Signed-off-by: Harvey Harrison 
Signed-off-by: David S. Miller

net: replace %p6 with %pI6

2008-10-29T19:52:50+00:00

Signed-off-by: Harvey Harrison 
Signed-off-by: David S. Miller

net: replace uses of NIP6_FMT with %p6

2008-10-29T06:02:31+00:00

Signed-off-by: Harvey Harrison 
Signed-off-by: David S. Miller