diff options
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Kconfig | 6 | ||||
| -rw-r--r-- | net/sched/sch_atm.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index d3f7c3f940..8a74cac0be 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -97,7 +97,7 @@ config NET_SCH_ATM | |||
| 97 | select classes of this queuing discipline. Each class maps | 97 | select classes of this queuing discipline. Each class maps |
| 98 | the flow(s) it is handling to a given virtual circuit. | 98 | the flow(s) it is handling to a given virtual circuit. |
| 99 | 99 | ||
| 100 | See the top of <file:net/sched/sch_atm.c>) for more details. | 100 | See the top of <file:net/sched/sch_atm.c> for more details. |
| 101 | 101 | ||
| 102 | To compile this code as a module, choose M here: the | 102 | To compile this code as a module, choose M here: the |
| 103 | module will be called sch_atm. | 103 | module will be called sch_atm. |
| @@ -137,7 +137,7 @@ config NET_SCH_SFQ | |||
| 137 | tristate "Stochastic Fairness Queueing (SFQ)" | 137 | tristate "Stochastic Fairness Queueing (SFQ)" |
| 138 | ---help--- | 138 | ---help--- |
| 139 | Say Y here if you want to use the Stochastic Fairness Queueing (SFQ) | 139 | Say Y here if you want to use the Stochastic Fairness Queueing (SFQ) |
| 140 | packet scheduling algorithm . | 140 | packet scheduling algorithm. |
| 141 | 141 | ||
| 142 | See the top of <file:net/sched/sch_sfq.c> for more details. | 142 | See the top of <file:net/sched/sch_sfq.c> for more details. |
| 143 | 143 | ||
| @@ -306,7 +306,7 @@ config NET_CLS_RSVP6 | |||
| 306 | is important for real time data such as streaming sound or video. | 306 | is important for real time data such as streaming sound or video. |
| 307 | 307 | ||
| 308 | Say Y here if you want to be able to classify outgoing packets based | 308 | Say Y here if you want to be able to classify outgoing packets based |
| 309 | on their RSVP requests and you are using the IPv6. | 309 | on their RSVP requests and you are using the IPv6 protocol. |
| 310 | 310 | ||
| 311 | To compile this code as a module, choose M here: the | 311 | To compile this code as a module, choose M here: the |
| 312 | module will be called cls_rsvp6. | 312 | module will be called cls_rsvp6. |
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 417ec8fb7f..ddc4f2c543 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c | |||
| @@ -292,13 +292,12 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, | |||
| 292 | } | 292 | } |
| 293 | } | 293 | } |
| 294 | DPRINTK("atm_tc_change: new id %x\n", classid); | 294 | DPRINTK("atm_tc_change: new id %x\n", classid); |
| 295 | flow = kmalloc(sizeof(struct atm_flow_data) + hdr_len, GFP_KERNEL); | 295 | flow = kzalloc(sizeof(struct atm_flow_data) + hdr_len, GFP_KERNEL); |
| 296 | DPRINTK("atm_tc_change: flow %p\n", flow); | 296 | DPRINTK("atm_tc_change: flow %p\n", flow); |
| 297 | if (!flow) { | 297 | if (!flow) { |
| 298 | error = -ENOBUFS; | 298 | error = -ENOBUFS; |
| 299 | goto err_out; | 299 | goto err_out; |
| 300 | } | 300 | } |
| 301 | memset(flow, 0, sizeof(*flow)); | ||
| 302 | flow->filter_list = NULL; | 301 | flow->filter_list = NULL; |
| 303 | if (!(flow->q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, classid))) | 302 | if (!(flow->q = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops, classid))) |
| 304 | flow->q = &noop_qdisc; | 303 | flow->q = &noop_qdisc; |