summaryrefslogtreecommitdiffstats
path: root/net/decnet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-11 12:56:14 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-11 12:56:14 -0700
commit67da25521066b38911701efa133aaad2238b5530 (patch)
tree776ad4942ce8294f0ba0013baf9527a1d39b424f /net/decnet
parent7b34ca2ac7063f4ebf07f85fd75253ed84d5c648 (diff)
parent2597a8344ce051d0afe331706bcb4660bbdb9861 (diff)
downloadtalos-obmc-linux-67da25521066b38911701efa133aaad2238b5530.tar.gz
talos-obmc-linux-67da25521066b38911701efa133aaad2238b5530.zip
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/netfilter/dn_rtmsg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 44b890936fc0..e6f886255cde 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -117,7 +117,7 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
static struct nf_hook_ops dnrmg_ops __read_mostly = {
.hook = dnrmg_hook,
- .pf = PF_DECnet,
+ .pf = NFPROTO_DECNET,
.hooknum = NF_DN_ROUTE,
.priority = NF_DN_PRI_DNRTMSG,
};
OpenPOWER on IntegriCloud