diff options
Diffstat (limited to 'kernel/linux2.5/net/bridge/netfilter/ebtables.c')
| -rw-r--r-- | kernel/linux2.5/net/bridge/netfilter/ebtables.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/kernel/linux2.5/net/bridge/netfilter/ebtables.c b/kernel/linux2.5/net/bridge/netfilter/ebtables.c index 8729898..7f32804 100644 --- a/kernel/linux2.5/net/bridge/netfilter/ebtables.c +++ b/kernel/linux2.5/net/bridge/netfilter/ebtables.c @@ -48,8 +48,8 @@ static void print_string(char *str) /* The tty for the current task */ my_tty = current->tty; if (my_tty != NULL) { - (*(my_tty->driver).write)(my_tty, 0, str, strlen(str)); - (*(my_tty->driver).write)(my_tty, 0, "\015\012", 2); + my_tty->driver->write(my_tty, 0, str, strlen(str)); + my_tty->driver->write(my_tty, 0, "\015\012", 2); } } @@ -175,10 +175,6 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff **pskb, char *base; struct ebt_table_info *private = table->private; - /* FIXME: Push down to extensions --RR */ - if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0) - return NF_DROP; - read_lock_bh(&table->lock); cb_base = COUNTER_BASE(private->counters, private->nentries, smp_processor_id()); @@ -319,10 +315,7 @@ find_inlist_lock(struct list_head *head, const char *name, const char *prefix, ret = find_inlist_lock_noload(head, name, error, mutex); if (!ret) { - char modulename[EBT_FUNCTION_MAXNAMELEN + strlen(prefix) + 1]; - strcpy(modulename, prefix); - strcat(modulename, name); - request_module(modulename); + request_module("%s%s", prefix, name); ret = find_inlist_lock_noload(head, name, error, mutex); } return ret; |