diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 18:22:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-02 18:22:20 -0400 |
| commit | 856fc004b82ae31846b3037558ec1b2a6286e629 (patch) | |
| tree | 189bc08337771f9318b3b789f44949c84bd9ed7e /net/sched/cls_basic.c | |
| parent | 5c0efdbc1b1891857659594741a4cb6405b63126 (diff) | |
| parent | 84565070e442583ec67fb08a5962c80203e491c3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TCP]: Do receiver-side SWS avoidance for rcvbuf < MSS.
[BNX2]: Fix nvram write logic.
[IPv6]: Fix incorrect length check in rawv6_sendmsg()
[NET_SCHED]: cls_basic: fix memory leak in basic_destroy
[NET]: Change "not found" return value for rule lookup
Diffstat (limited to 'net/sched/cls_basic.c')
| -rw-r--r-- | net/sched/cls_basic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index 70fe36eb66a2..4a91f082a81d 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c | |||
| @@ -109,6 +109,7 @@ static void basic_destroy(struct tcf_proto *tp) | |||
| 109 | list_del(&f->link); | 109 | list_del(&f->link); |
| 110 | basic_delete_filter(tp, f); | 110 | basic_delete_filter(tp, f); |
| 111 | } | 111 | } |
| 112 | kfree(head); | ||
| 112 | } | 113 | } |
| 113 | 114 | ||
| 114 | static int basic_delete(struct tcf_proto *tp, unsigned long arg) | 115 | static int basic_delete(struct tcf_proto *tp, unsigned long arg) |