diff --git a/[refs] b/[refs] index 5d892946d858..aebed945e751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48d5cad87c3a4998d0bda16ccfb5c60dfe4de5fb +refs/heads/master: 9c92d3486434e7310cb288587953e2dae4a79701 diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h index 3ca3d9ee78a9..468896939843 100644 --- a/trunk/include/linux/netfilter.h +++ b/trunk/include/linux/netfilter.h @@ -318,7 +318,7 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb, struct net_device *indev, struct net_device *outdev, int (*okfn)(struct sk_buff *)) { - return okfn(*pskb); + return 1; } static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} struct flowi;