diff options
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r-- | net/sched/sch_generic.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 8bb7c47191ea..7683b34dc6a9 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -243,31 +243,27 @@ static void dev_watchdog_down(struct net_device *dev) | |||
243 | cheaper. | 243 | cheaper. |
244 | */ | 244 | */ |
245 | 245 | ||
246 | static int | 246 | static int noop_enqueue(struct sk_buff *skb, struct Qdisc * qdisc) |
247 | noop_enqueue(struct sk_buff *skb, struct Qdisc * qdisc) | ||
248 | { | 247 | { |
249 | kfree_skb(skb); | 248 | kfree_skb(skb); |
250 | return NET_XMIT_CN; | 249 | return NET_XMIT_CN; |
251 | } | 250 | } |
252 | 251 | ||
253 | static struct sk_buff * | 252 | static struct sk_buff *noop_dequeue(struct Qdisc * qdisc) |
254 | noop_dequeue(struct Qdisc * qdisc) | ||
255 | { | 253 | { |
256 | return NULL; | 254 | return NULL; |
257 | } | 255 | } |
258 | 256 | ||
259 | static int | 257 | static int noop_requeue(struct sk_buff *skb, struct Qdisc* qdisc) |
260 | noop_requeue(struct sk_buff *skb, struct Qdisc* qdisc) | ||
261 | { | 258 | { |
262 | if (net_ratelimit()) | 259 | if (net_ratelimit()) |
263 | printk(KERN_DEBUG "%s deferred output. It is buggy.\n", skb->dev->name); | 260 | printk(KERN_DEBUG "%s deferred output. It is buggy.\n", |
261 | skb->dev->name); | ||
264 | kfree_skb(skb); | 262 | kfree_skb(skb); |
265 | return NET_XMIT_CN; | 263 | return NET_XMIT_CN; |
266 | } | 264 | } |
267 | 265 | ||
268 | struct Qdisc_ops noop_qdisc_ops = { | 266 | struct Qdisc_ops noop_qdisc_ops = { |
269 | .next = NULL, | ||
270 | .cl_ops = NULL, | ||
271 | .id = "noop", | 267 | .id = "noop", |
272 | .priv_size = 0, | 268 | .priv_size = 0, |
273 | .enqueue = noop_enqueue, | 269 | .enqueue = noop_enqueue, |
@@ -285,8 +281,6 @@ struct Qdisc noop_qdisc = { | |||
285 | }; | 281 | }; |
286 | 282 | ||
287 | static struct Qdisc_ops noqueue_qdisc_ops = { | 283 | static struct Qdisc_ops noqueue_qdisc_ops = { |
288 | .next = NULL, | ||
289 | .cl_ops = NULL, | ||
290 | .id = "noqueue", | 284 | .id = "noqueue", |
291 | .priv_size = 0, | 285 | .priv_size = 0, |
292 | .enqueue = noop_enqueue, | 286 | .enqueue = noop_enqueue, |