projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: kill nf_hooks_active
[linux-2.6-block.git]
/
include
/
linux
/
netfilter.h
diff --git
a/include/linux/netfilter.h
b/include/linux/netfilter.h
index 00050dfd9f2309e9cd0f9a62f133e0d589fc47de..60e89348a91de406e046e988a0c5d940239b4438 100644
(file)
--- a/
include/linux/netfilter.h
+++ b/
include/linux/netfilter.h
@@
-150,11
+150,6
@@
static inline bool nf_hook_list_active(struct list_head *nf_hook_list,
}
#endif
}
#endif
-static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
-{
- return nf_hook_list_active(&nf_hooks[pf][hook], pf, hook);
-}
-
int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state);
/**
int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state);
/**
@@
-172,10
+167,12
@@
static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
int (*okfn)(struct sock *, struct sk_buff *),
int thresh)
{
int (*okfn)(struct sock *, struct sk_buff *),
int thresh)
{
- if (nf_hooks_active(pf, hook)) {
+ struct list_head *nf_hook_list = &nf_hooks[pf][hook];
+
+ if (nf_hook_list_active(nf_hook_list, pf, hook)) {
struct nf_hook_state state;
struct nf_hook_state state;
- nf_hook_state_init(&state,
&nf_hooks[pf][hook]
, hook, thresh,
+ nf_hook_state_init(&state,
nf_hook_list
, hook, thresh,
pf, indev, outdev, sk, okfn);
return nf_hook_slow(skb, &state);
}
pf, indev, outdev, sk, okfn);
return nf_hook_slow(skb, &state);
}