SOURCES (LINUX_2_6_28): kernel-ipt_account.patch - adjusted for .28 api

[zbyniu]

Author: zbyniu                       Date: Wed Mar 25 20:52:30 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6_28
---- Log message:
- adjusted for .28 api

---- Files affected:
SOURCES:
   kernel-ipt_account.patch (1.1.2.6 -> 1.1.2.6.12.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ipt_account.patch
diff -u SOURCES/kernel-ipt_account.patch:1.1.2.6 SOURCES/kernel-ipt_account.patch:1.1.2.6.12.1
--- SOURCES/kernel-ipt_account.patch:1.1.2.6	Sun Jan 20 00:04:41 2008
+++ SOURCES/kernel-ipt_account.patch	Wed Mar 25 21:52:24 2009
@@ -1,7 +1,7 @@
 diff -uNrp linux/net/ipv4/netfilter/ipt_account.c linux/net/ipv4/netfilter/ipt_account.c
 --- linux/net/ipv4/netfilter/ipt_account.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux/net/ipv4/netfilter/ipt_account.c	2007-08-04 16:22:15.000000000 +0200
-@@ -0,0 +1,973 @@
+@@ -0,0 +1,981 @@
 +/* Copyright (c) 2004-2007 Piotr 'QuakeR' Gasidlo <quaker at barbara.eu.org>
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -356,6 +356,7 @@
 + */
 +static bool
 +match(const struct sk_buff *skb,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
 +      const struct net_device *in,
 +      const struct net_device *out,
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
@@ -365,8 +366,11 @@
 +      int offset,
 +      unsigned int protoff,
 +      bool *hotdrop)
++#else
++	const struct xt_match_param *par)
++#endif
 +{
-+  struct t_ipt_account_info *info = (struct t_ipt_account_info *)matchinfo;
++  struct t_ipt_account_info *info = (struct t_ipt_account_info *)par->matchinfo;
 +  struct t_ipt_account_table *table = info->table;
 +  u_int32_t address;  
 +  /* Get current time. */
@@ -459,6 +463,9 @@
 + * Checkentry function.
 + */
 +static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++checkentry(const struct xt_mtchk_param *par)
++#else
 +checkentry(const char *tablename,
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)    
 +     const void *ip,
@@ -473,8 +480,9 @@
 +     unsigned int matchsize,
 +#endif     
 +     unsigned int hook_mask)
++#endif
 +{
-+  struct t_ipt_account_info *info = matchinfo;
++  struct t_ipt_account_info *info = par->matchinfo;
 +  struct t_ipt_account_table *table;
 +
 +#ifdef DEBUG_IPT_ACCOUNT  
@@ -567,6 +575,9 @@
 + */
 +static void
 +destroy(
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
++    const struct xt_mtdtor_param *par
++#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)    
 +    const struct xt_match *match,
 +#endif    
@@ -576,9 +587,10 @@
 +    void *matchinfo,
 +    unsigned int matchsize
 +#endif    
++#endif
 +)
 +{
-+  struct t_ipt_account_info *info = matchinfo;
++  struct t_ipt_account_info *info = par->matchinfo;
 +  
 +#ifdef DEBUG_IPT_ACCOUNT  
 +  if (debug) printk(KERN_DEBUG "ipt_account [destroy]: name = %s\n", info->name);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ipt_account.patch?r1=1.1.2.6&r2=1.1.2.6.12.1&f=u