git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
bridge
/
br_forward.c
diff --git
a/net/bridge/br_forward.c
b/net/bridge/br_forward.c
index
056df7c
..
864fbbc
100644
(file)
--- a/
net/bridge/br_forward.c
+++ b/
net/bridge/br_forward.c
@@
-20,14
+20,11
@@
#include <linux/netfilter_bridge.h>
#include "br_private.h"
#include <linux/netfilter_bridge.h>
#include "br_private.h"
+/* Don't forward packets to originating port or forwarding diasabled */
static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb)
{
static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb)
{
- if (skb->dev == p->dev ||
- p->state != BR_STATE_FORWARDING)
- return 0;
-
- return 1;
+ return (skb->dev != p->dev && p->state == BR_STATE_FORWARDING);
}
static inline unsigned packet_length(const struct sk_buff *skb)
}
static inline unsigned packet_length(const struct sk_buff *skb)
@@
-37,8
+34,8
@@
static inline unsigned packet_length(const struct sk_buff *skb)
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
- /* drop mtu oversized packets except
t
so */
- if (
skb->len
> skb->dev->mtu && !skb_is_gso(skb))
+ /* drop mtu oversized packets except
g
so */
+ if (
packet_length(skb)
> skb->dev->mtu && !skb_is_gso(skb))
kfree_skb(skb);
else {
#ifdef CONFIG_BRIDGE_NETFILTER
kfree_skb(skb);
else {
#ifdef CONFIG_BRIDGE_NETFILTER
@@
-59,10
+56,9
@@
int br_dev_queue_push_xmit(struct sk_buff *skb)
int br_forward_finish(struct sk_buff *skb)
{
int br_forward_finish(struct sk_buff *skb)
{
- NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
-
br_dev_queue_push_xmit);
+
return
NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ br_dev_queue_push_xmit);
- return 0;
}
static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)
}
static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)