git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
sched
/
cls_rsvp.h
diff --git
a/net/sched/cls_rsvp.h
b/net/sched/cls_rsvp.h
index
6e230ec
..
572f06b
100644
(file)
--- a/
net/sched/cls_rsvp.h
+++ b/
net/sched/cls_rsvp.h
@@
-65,6
+65,7
@@
Well, as result, despite its simplicity, we get a pretty
powerful classification engine. */
Well, as result, despite its simplicity, we get a pretty
powerful classification engine. */
+#include <linux/config.h>
struct rsvp_head
{
struct rsvp_head
{
@@
-240,8
+241,9
@@
static int rsvp_init(struct tcf_proto *tp)
{
struct rsvp_head *data;
{
struct rsvp_head *data;
- data = k
z
alloc(sizeof(struct rsvp_head), GFP_KERNEL);
+ data = k
m
alloc(sizeof(struct rsvp_head), GFP_KERNEL);
if (data) {
if (data) {
+ memset(data, 0, sizeof(struct rsvp_head));
tp->root = data;
return 0;
}
tp->root = data;
return 0;
}
@@
-445,10
+447,11
@@
static int rsvp_change(struct tcf_proto *tp, unsigned long base,
goto errout2;
err = -ENOBUFS;
goto errout2;
err = -ENOBUFS;
- f = k
z
alloc(sizeof(struct rsvp_filter), GFP_KERNEL);
+ f = k
m
alloc(sizeof(struct rsvp_filter), GFP_KERNEL);
if (f == NULL)
goto errout2;
if (f == NULL)
goto errout2;
+ memset(f, 0, sizeof(*f));
h2 = 16;
if (tb[TCA_RSVP_SRC-1]) {
err = -EINVAL;
h2 = 16;
if (tb[TCA_RSVP_SRC-1]) {
err = -EINVAL;
@@
-530,9
+533,10
@@
insert:
/* No session found. Create new one. */
err = -ENOBUFS;
/* No session found. Create new one. */
err = -ENOBUFS;
- s = k
z
alloc(sizeof(struct rsvp_session), GFP_KERNEL);
+ s = k
m
alloc(sizeof(struct rsvp_session), GFP_KERNEL);
if (s == NULL)
goto errout;
if (s == NULL)
goto errout;
+ memset(s, 0, sizeof(*s));
memcpy(s->dst, dst, sizeof(s->dst));
if (pinfo) {
memcpy(s->dst, dst, sizeof(s->dst));
if (pinfo) {