summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorlefranc2010-06-14 12:47:54 +0000
committerlefranc2010-06-14 12:47:54 +0000
commit622e9aacd15e735c1b4bf46f79ed4f7202d8e640 (patch)
tree459db7fd38f9ffcb359d8358c176237ad984918a /cleopatre
parent38c39a44d20004b0357cf169e4dc1682cda9a0cf (diff)
Revert "cleo/linux: allow brige to resent HPAV MME to the same interface, closes #1526"
- God of programming, forgive me... This reverts commit c646a2c09d3fa0dde6b2bac6b89b74c454f12f9e. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7205 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/net/bridge/br_forward.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/net/bridge/br_forward.c b/cleopatre/linux-2.6.25.10-spc300/net/bridge/br_forward.c
index 6cf4192cc4..bdd7c35c3c 100644
--- a/cleopatre/linux-2.6.25.10-spc300/net/bridge/br_forward.c
+++ b/cleopatre/linux-2.6.25.10-spc300/net/bridge/br_forward.c
@@ -20,14 +20,11 @@
#include <linux/netfilter_bridge.h>
#include "br_private.h"
-/* Don't forward packets to originating port or forwarding disabled,
- * except if it is a unicast HPAV MME packet */
+/* 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)
{
- return (((skb->dev != p->dev)
- || ((skb->protocol == htons(ETH_P_HPAV)) && !(skb->mac_header[0] & 1)))
- && p->state == BR_STATE_FORWARDING);
+ return (skb->dev != p->dev && p->state == BR_STATE_FORWARDING);
}
static inline unsigned packet_length(const struct sk_buff *skb)