Merge branch 'master' of git://1984.lsi.us.es/net-next

This commit is contained in:
David S. Miller 2012-06-11 12:56:14 -07:00
commit 67da255210
34 changed files with 1300 additions and 584 deletions

View file

@ -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,
};