git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /repos/git/net-next-2.6
[sfrench/cifs-2.6.git]
/
net
/
decnet
/
dn_nsp_in.c
diff --git
a/net/decnet/dn_nsp_in.c
b/net/decnet/dn_nsp_in.c
index 25a37299bc65c0fd8652c886758a372c1bdcf66a..b430549e2b917301320b26d91fd95dacbd305fb9 100644
(file)
--- a/
net/decnet/dn_nsp_in.c
+++ b/
net/decnet/dn_nsp_in.c
@@
-810,7
+810,8
@@
free_out:
int dn_nsp_rx(struct sk_buff *skb)
{
- return NF_HOOK(PF_DECnet, NF_DN_LOCAL_IN, skb, skb->dev, NULL, dn_nsp_rx_packet);
+ return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_IN, skb, skb->dev, NULL,
+ dn_nsp_rx_packet);
}
/*