diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-11 21:56:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-11 21:56:14 +0200 |
| commit | 67da25521066b38911701efa133aaad2238b5530 (patch) | |
| tree | 776ad4942ce8294f0ba0013baf9527a1d39b424f /net/decnet | |
| parent | inet: Avoid potential NULL peer dereference. (diff) | |
| parent | netfilter: selinux: switch hook PFs to nfproto (diff) | |
| download | linux-67da25521066b38911701efa133aaad2238b5530.tar.xz 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.c | 2 |
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, }; |