linux.git/net/bridge, branch v3.0-rc2

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

2011-05-27T17:04:40+00:00

netfilter: Fix several warnings in compat_mtw_from_user().

2011-05-26T17:09:07+00:00

Kill set but not used 'entry_offset'.

Add a default case to the switch statement so the compiler
can see that we always initialize off and size_kern before
using them.

Signed-off-by: David S. Miller 
Signed-off-by: Pablo Neira Ayuso

bridge: initialize fake_rtable metrics

2011-05-24T17:32:18+00:00

bridge netfilter code uses a fake_rtable, and we must init its _metric
field or risk NULL dereference later.

Ref: https://bugzilla.kernel.org/show_bug.cgi?id=35672

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: remove synchronize_net() from netdev_set_master()

2011-05-23T01:01:20+00:00

In the old days, we used to access dev->master in __netif_receive_skb()
in a rcu_read_lock section.

So one synchronize_net() call was needed in netdev_set_master() to make
sure another cpu could not use old master while/after we release it.

We now use netdev_rx_handler infrastructure and added one
synchronize_net() call in bond_release()/bond_release_all()

Remove the obsolete synchronize_net() from netdev_set_master() and add
one in bridge del_nbp() after its netdev_rx_handler_unregister() call.

This makes enslave -d a bit faster.

Signed-off-by: Eric Dumazet 
CC: Jiri Pirko 
CC: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: call NETDEV_JOIN notifiers when add a slave

2011-05-23T01:01:19+00:00

In the previous patch I added NETDEV_JOIN, now
we can notify netconsole when adding a device to a bridge too.

Signed-off-by: WANG Cong 
Cc: Neil Horman 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-17T21:33:11+00:00

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

bridge: fix forwarding of IPv6

2011-05-13T20:03:24+00:00

The commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e
    bridge: Reset IPCB when entering IP stack on NF_FORWARD
broke forwarding of IPV6 packets in bridge because it would
call bp_parse_ip_options with an IPV6 packet.

Reported-by: Noah Meyerhans 
Signed-off-by: Stephen Hemminger 
Reviewed-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6

2011-05-11T18:26:58+00:00

Conflicts:
	drivers/net/benet/be_main.c

netfilter: ebtables: only call xt_compat_add_offset once per rule

2011-05-10T07:52:17+00:00

The optimizations in commit 255d0dc34068a976
(netfilter: x_table: speedup compat operations) assume that
xt_compat_add_offset is called once per rule.

ebtables however called it for each match/target found in a rule.

The match/watcher/target parser already returns the needed delta, so it
is sufficient to move the xt_compat_add_offset call to a more reasonable
location.

While at it, also get rid of the unused COMPAT iterator macros.

Signed-off-by: Florian Westphal 
Signed-off-by: Patrick McHardy

netfilter: fix ebtables compat support

2011-05-10T07:48:59+00:00

commit 255d0dc34068a976 (netfilter: x_table: speedup compat operations)
made ebtables not working anymore.

1) xt_compat_calc_jump() is not an exact match lookup
2) compat_table_info() has a typo in xt_compat_init_offsets() call
3) compat_do_replace() misses a xt_compat_init_offsets() call

Reported-by: dann frazier 
Signed-off-by: Eric Dumazet 
Signed-off-by: Patrick McHardy