diff options
| author | Linus Lüssing <linus.luessing@web.de> | 2010-06-06 21:28:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-18 16:59:40 -0700 |
| commit | 96d592ed599434d2d5f339a1d282871bc6377d2c (patch) | |
| tree | bc18bc54567c561235bb552e14cb5839657e5a94 /drivers/staging/batman-adv/send.c | |
| parent | 186305aa1284ac0cae88e18b837c33d5a4a84afc (diff) | |
| download | op-kernel-dev-96d592ed599434d2d5f339a1d282871bc6377d2c.zip op-kernel-dev-96d592ed599434d2d5f339a1d282871bc6377d2c.tar.gz | |
Staging: batman-adv: Adding netfilter-bridge hooks
batman-adv is receiving and sending the packets of its own ether type
on a very early/low level. Therefore we need to add explicit hooks to
give netfilter/ebtables a chance to filter them.
Reported-by: Antonio Quartulli <ordex@ritirata.org>
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/send.c')
| -rw-r--r-- | drivers/staging/batman-adv/send.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c index ac69ed8..7365f6d 100644 --- a/drivers/staging/batman-adv/send.c +++ b/drivers/staging/batman-adv/send.c @@ -29,6 +29,8 @@ #include "vis.h" #include "aggregation.h" +#include <linux/netfilter_bridge.h> + /* apply hop penalty for a normal link */ static uint8_t hop_penalty(const uint8_t tq) { @@ -90,9 +92,12 @@ int send_skb_packet(struct sk_buff *skb, /* dev_queue_xmit() returns a negative result on error. However on * congestion and traffic shaping, it drops and returns NET_XMIT_DROP - * (which is > 0). This will not be treated as an error. */ + * (which is > 0). This will not be treated as an error. + * Also, if netfilter/ebtables wants to block outgoing batman + * packets then giving them a chance to do so here */ - return dev_queue_xmit(skb); + return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, + dev_queue_xmit); send_skb_err: kfree_skb(skb); return NET_XMIT_DROP; |
