diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-10-13 16:37:45 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-10-13 18:00:50 +0200 |
| commit | 75f0a0fd787bfa3ea1a916ca632a5b9e0007cbb7 (patch) | |
| tree | 1928cb3401ead89d561e04d4d317422a0ed80283 /include/linux/netfilter_arp | |
| parent | 243bf6e29eef642de0ff62f1ebf58bc2396d6d6e (diff) | |
| download | linux-stable-75f0a0fd787bfa3ea1a916ca632a5b9e0007cbb7.tar.gz linux-stable-75f0a0fd787bfa3ea1a916ca632a5b9e0007cbb7.tar.bz2 linux-stable-75f0a0fd787bfa3ea1a916ca632a5b9e0007cbb7.zip | |
netfilter: xtables: unify {ip,ip6,arp}t_error_target
Unification of struct *_error_target was forgotten in
v2.6.16-1689-g1e30a01.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'include/linux/netfilter_arp')
| -rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index 6e2341a811d6..f02d57436a34 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -26,6 +26,7 @@ #define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN #define arpt_entry_target xt_entry_target #define arpt_standard_target xt_standard_target +#define arpt_error_target xt_error_target #define ARPT_CONTINUE XT_CONTINUE #define ARPT_RETURN XT_RETURN #define arpt_counters_info xt_counters_info @@ -216,14 +217,9 @@ struct arpt_standard { struct xt_standard_target target; }; -struct arpt_error_target { - struct xt_entry_target target; - char errorname[XT_FUNCTION_MAXNAMELEN]; -}; - struct arpt_error { struct arpt_entry entry; - struct arpt_error_target target; + struct xt_error_target target; }; #define ARPT_ENTRY_INIT(__size) \ @@ -244,7 +240,7 @@ struct arpt_error { { \ .entry = ARPT_ENTRY_INIT(sizeof(struct arpt_error)), \ .target = XT_TARGET_INIT(XT_ERROR_TARGET, \ - sizeof(struct arpt_error_target)), \ + sizeof(struct xt_error_target)), \ .target.errorname = "ERROR", \ } |