← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to net/netfilter/xt_rateest.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/netfilter/xt_rateest.c
78
78
{
79
79
        struct xt_rateest_match_info *info = par->matchinfo;
80
80
        struct xt_rateest *est1, *est2;
81
 
        int ret = false;
 
81
        int ret = -EINVAL;
82
82
 
83
83
        if (hweight32(info->flags & (XT_RATEEST_MATCH_ABS |
84
84
                                     XT_RATEEST_MATCH_REL)) != 1)
101
101
        if (!est1)
102
102
                goto err1;
103
103
 
 
104
        est2 = NULL;
104
105
        if (info->flags & XT_RATEEST_MATCH_REL) {
105
106
                est2 = xt_rateest_lookup(info->name2);
106
107
                if (!est2)
107
108
                        goto err2;
108
 
        } else
109
 
                est2 = NULL;
110
 
 
 
109
        }
111
110
 
112
111
        info->est1 = est1;
113
112
        info->est2 = est2;
116
115
err2:
117
116
        xt_rateest_put(est1);
118
117
err1:
119
 
        return -EINVAL;
 
118
        return ret;
120
119
}
121
120
 
122
121
static void xt_rateest_mt_destroy(const struct xt_mtdtor_param *par)