projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'kumar/merge' into merge
[cascardo/linux.git]
/
net
/
bridge
/
br_stp_bpdu.c
diff --git
a/net/bridge/br_stp_bpdu.c
b/net/bridge/br_stp_bpdu.c
index
d66cce1
..
217bd22
100644
(file)
--- a/
net/bridge/br_stp_bpdu.c
+++ b/
net/bridge/br_stp_bpdu.c
@@
-50,7
+50,7
@@
static void br_send_bpdu(struct net_bridge_port *p,
llc_mac_hdr_init(skb, p->dev->dev_addr, p->br->group_addr);
- NF_HOOK(
PF
_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ NF_HOOK(
NFPROTO
_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
dev_queue_xmit);
}