git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bluetooth: scheduling while atomic bug fix
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
xt_SECMARK.c
diff --git
a/net/netfilter/xt_SECMARK.c
b/net/netfilter/xt_SECMARK.c
index
ad05214
..
7a6f9e6
100644
(file)
--- a/
net/netfilter/xt_SECMARK.c
+++ b/
net/netfilter/xt_SECMARK.c
@@
-80,16
+80,14
@@
static bool checkentry_selinux(struct xt_secmark_target_info *info)
return true;
}
return true;
}
-static bool
-secmark_tg_check(const char *tablename, const void *entry,
- const struct xt_target *target, void *targinfo,
- unsigned int hook_mask)
+static bool secmark_tg_check(const struct xt_tgchk_param *par)
{
{
- struct xt_secmark_target_info *info = targinfo;
+ struct xt_secmark_target_info *info =
par->
targinfo;
- if (strcmp(tablename, "mangle") && strcmp(tablename, "security")) {
+ if (strcmp(par->table, "mangle") != 0 &&
+ strcmp(par->table, "security") != 0) {
printk(KERN_INFO PFX "target only valid in the \'mangle\' "
printk(KERN_INFO PFX "target only valid in the \'mangle\' "
- "or \'security\' tables, not \'%s\'.\n",
tablenam
e);
+ "or \'security\' tables, not \'%s\'.\n",
par->tabl
e);
return false;
}
return false;
}
@@
-115,7
+113,7
@@
secmark_tg_check(const char *tablename, const void *entry,
return true;
}
return true;
}
-static void secmark_tg_destroy(const struct xt_t
arget *target, void *targinfo
)
+static void secmark_tg_destroy(const struct xt_t
gdtor_param *par
)
{
switch (mode) {
case SECMARK_MODE_SEL:
{
switch (mode) {
case SECMARK_MODE_SEL: