Merge branch 'master' of git://dev.medozas.de/linux

This commit is contained in:
Patrick McHardy 2010-05-11 18:59:21 +02:00
commit cba7a98a47
98 changed files with 316 additions and 367 deletions

View file

@ -199,7 +199,7 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
{
int ret = 0, result = 0;
struct tcf_ipt *ipt = a->priv;
struct xt_target_param par;
struct xt_action_param par;
if (skb_cloned(skb)) {
if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))