git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
batman-adv
/
send.c
diff --git
a/drivers/staging/batman-adv/send.c
b/drivers/staging/batman-adv/send.c
index
055edee
..
da3c82e
100644
(file)
--- a/
drivers/staging/batman-adv/send.c
+++ b/
drivers/staging/batman-adv/send.c
@@
-29,7
+29,6
@@
#include "vis.h"
#include "aggregation.h"
#include "vis.h"
#include "aggregation.h"
-#include <linux/netfilter_bridge.h>
static void send_outstanding_bcast_packet(struct work_struct *work);
static void send_outstanding_bcast_packet(struct work_struct *work);
@@
-92,12
+91,9
@@
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
/* 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.
- * Also, if netfilter/ebtables wants to block outgoing batman
- * packets then giving them a chance to do so here */
+ * (which is > 0). This will not be treated as an error. */
- return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
- dev_queue_xmit);
+ return dev_queue_xmit(skb);
send_skb_err:
kfree_skb(skb);
return NET_XMIT_DROP;
send_skb_err:
kfree_skb(skb);
return NET_XMIT_DROP;