linux-stable.git/net/bridge, branch linux-2.6.22.y

BRIDGE: Properly dereference the br_should_route_hook

2007-12-14T18:32:01+00:00

[BRIDGE]: Properly dereference the br_should_route_hook

[ Upstream commit: 82de382ce8e1c7645984616728dc7aaa057821e4 ]

This hook is protected with the RCU, so simple

if (br_should_route_hook)
	br_should_route_hook(...)

is not enough on some architectures.

Use the rcu_dereference/rcu_assign_pointer in this case.

Fixed Stephen's comment concerning using the typeof().

Signed-off-by: Pavel Emelyanov 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

BRIDGE: Lost call to br_fdb_fini() in br_init() error path

2007-12-14T18:32:00+00:00

[BRIDGE]: Lost call to br_fdb_fini() in br_init() error path

[ Upstream commit: 17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e ]
 
In case the br_netfilter_init() (or any subsequent call)
fails, the br_fdb_fini() must be called to free the allocated
in br_fdb_init() br_fdb_cache kmem cache.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

Fix oops in vlan and bridging code

2007-09-26T17:54:43+00:00

commit 8c7b43a2e58baa24002fa2b266d9a5007bc52a40 in mainline

I tried to preserve bridging code as it was before, but logic is quite
strange - I think we should free skb on error, since it is already
unshared and thus will just leak.

Herbert Xu states:

> +	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
> +		goto out;

If this happens it'll be a double-free on skb since we'll
return NF_DROP which makes the caller free it too.

We could return NF_STOLEN to prevent that but I'm not sure
whether that's correct netfilter semantics.  Patrick, could
you please make a call on this?

Patrick McHardy states:

NF_STOLEN should work fine here.

Signed-off-by: Evgeniy Polyakov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

NET: Share correct feature code between bridging and bonding

2007-08-31T06:01:00+00:00

[NET]: Share correct feature code between bridging and bonding

http://bugzilla.kernel.org/show_bug.cgi?id=8797 shows that the
bonding driver may produce bogus combinations of the checksum
flags and SG/TSO.

For example, if you bond devices with NETIF_F_HW_CSUM and
NETIF_F_IP_CSUM you'll end up with a bonding device that
has neither flag set.  If both have TSO then this produces
an illegal combination.

The bridge device on the other hand has the correct code to
deal with this.

In fact, the same code can be used for both.  So this patch
moves that logic into net/core/dev.c and uses it for both
bonding and bridging.

In the process I've made small adjustments such as only
setting GSO_ROBUST if at least one constituent device
supports it.

Signed-off-by: Herbert Xu 
Acked-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

Netfilter: Fix logging regression

2007-08-09T21:27:46+00:00

[NETFILTER]: Fix logging regression

Loading one of the LOG target fails if a different target has already
registered itself as backend for the same family. This can affect the
ipt_LOG and ipt_ULOG modules when both are loaded.

Reported and tested by: 
Upstream-commit: 7e2acc7e

Signed-off-by: Patrick McHardy 
Signed-off-by: Greg Kroah-Hartman

[BRIDGE]: Round off STP perodic timers.

2007-05-31T08:23:39+00:00

Peroidic STP timers don't have to be exact.  The hold timer runs at
1HZ, and the hello timer normally runs at 2HZ; save power by aligning
it them to next second.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

[BRIDGE]: Reduce frequency of forwarding cleanup timer in bridge.

2007-05-31T08:23:38+00:00

The bridge cleanup timer is fired 10 times a second for timers that
are at least 15 seconds ahead in time and that are not critical to be
cleaned asap.

This patch calculates the next time to run the timer as the minimum of
all timers or a minimum based on the current state.

Signed-off-by: Baruch Even 
Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

header cleaning: don't include smp_lock.h when not used

2007-05-08T18:15:07+00:00

Remove includes of  where it is not used/needed.
Suggested by Al Viro.

Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc,
sparc64, and arm (all 59 defconfigs).

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[NET]: Rework dev_base via list_head (v3)

2007-05-03T22:13:45+00:00

Cleanup of dev_base list use, with the aim to simplify making device
list per-namespace. In almost every occasion, use of dev_base variable
and dev->next pointer could be easily replaced by for_each_netdev
loop. A few most complicated places were converted to using
first_netdev()/next_netdev().

Signed-off-by: Pavel Emelianov 
Acked-by: Kirill Korotaev 
Signed-off-by: David S. Miller

[NETFILTER]: bridge netfilter: consolidate header pushing/pulling code

2007-05-03T10:36:16+00:00

Consolidate the common push/pull sequences into a few helper functions.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller