diff options
author | sven-ola <sven-ola@3484d885-4da6-438d-b19d-107d078dd756> | 2010-10-13 20:20:19 +0200 |
---|---|---|
committer | sven-ola <sven-ola@3484d885-4da6-438d-b19d-107d078dd756> | 2010-10-13 20:20:19 +0200 |
commit | 53c6274071f4adab870dfc4173d1815287d65464 (patch) | |
tree | e0342751e538d76ebfc726d0a2909c79610413b8 /ip6t_MAP66.c | |
parent | bc06ff816f8dde2648f6efe5ebe80c3c7a8c6825 (diff) | |
download | NPTv6-53c6274071f4adab870dfc4173d1815287d65464.tar NPTv6-53c6274071f4adab870dfc4173d1815287d65464.zip |
git-svn-id: https://map66.svn.sourceforge.net/svnroot/map66@26 3484d885-4da6-438d-b19d-107d078dd756
Diffstat (limited to 'ip6t_MAP66.c')
-rw-r--r-- | ip6t_MAP66.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ip6t_MAP66.c b/ip6t_MAP66.c index b00c818..afcc57c 100644 --- a/ip6t_MAP66.c +++ b/ip6t_MAP66.c @@ -126,6 +126,7 @@ static unsigned int MAP66_tg6( &hdr->saddr, &hdr->daddr); #endif +#if 0 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) if (skb_cloned(skb) && !skb->sk) { struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC); @@ -143,6 +144,7 @@ static unsigned int MAP66_tg6( } #endif hdr = ipv6_hdr(skb); +#endif if (0 != (IP6T_MAP66_OPT_DST_TO & info->mapflags)) { pr_devel("MAP66 DST, nocheck=%d, ip_summed=%d\n", 0 != (IP6T_MAP66_OPT_NOCHECK & info->mapflags), skb->ip_summed); @@ -199,7 +201,7 @@ static bool MAP66_tg6_check( } if (0 != (IP6T_MAP66_OPT_DST_TO & info->mapflags) && (0 >= info->pfix_dst_len || - 0 != (IP6T_MAP66_OPT_UNBALANCED & info->mapflags) ? 8 : 7 < info->pfix_dst_len)) + (0 != (IP6T_MAP66_OPT_UNBALANCED & info->mapflags) ? 8 : 7) < info->pfix_dst_len)) { if (8 == info->pfix_dst_len) { printk("MAP66: --" IP6T_MAP66_DST_TO " prefix length /%d only possible with --unbalanced\n", 16 * info->pfix_dst_len); @@ -211,7 +213,7 @@ static bool MAP66_tg6_check( } if (0 != (IP6T_MAP66_OPT_SRC_TO & info->mapflags) && (0 >= info->pfix_src_len || - 0 != (IP6T_MAP66_OPT_UNBALANCED & info->mapflags) ? 8 : 7 < info->pfix_src_len)) + (0 != (IP6T_MAP66_OPT_UNBALANCED & info->mapflags) ? 8 : 7) < info->pfix_src_len)) { if (8 == info->pfix_src_len) { printk("MAP66: --" IP6T_MAP66_SRC_TO " prefix length /%d only possible with --unbalanced\n", 16 * info->pfix_src_len); |