Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17438
b: refs/heads/master
c: 541673c
h: refs/heads/master
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 9, 2006
1 parent 13fcead commit 3a45819
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31bd06eb33bbabe643385a861d780d950ca73846
refs/heads/master: 541673c859c0d71dedaaea1c148dfe3ccccc9422
2 changes: 2 additions & 0 deletions trunk/net/sched/pedit.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,12 @@ tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,int bind, int ref)
t.lastuse = jiffies_to_clock_t(jiffies - p->tm.lastuse);
t.expires = jiffies_to_clock_t(p->tm.expires);
RTA_PUT(skb, TCA_PEDIT_TM, sizeof(t), &t);
kfree(opt);
return skb->len;

rtattr_failure:
skb_trim(skb, b - skb->data);
kfree(opt);
return -1;
}

Expand Down

0 comments on commit 3a45819

Please sign in to comment.