Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2270
b: refs/heads/master
c: 94df109
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Graf authored and David S. Miller committed Jun 19, 2005
1 parent 693cfe9 commit 3b36f71
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f87a9c3ddf08c10d8427bcedf3f53098113136d0
refs/heads/master: 94df109a8c802263837baccc1a3eeab9ab9e88db
16 changes: 5 additions & 11 deletions trunk/net/sched/sch_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,31 +243,27 @@ static void dev_watchdog_down(struct net_device *dev)
cheaper.
*/

static int
noop_enqueue(struct sk_buff *skb, struct Qdisc * qdisc)
static int noop_enqueue(struct sk_buff *skb, struct Qdisc * qdisc)
{
kfree_skb(skb);
return NET_XMIT_CN;
}

static struct sk_buff *
noop_dequeue(struct Qdisc * qdisc)
static struct sk_buff *noop_dequeue(struct Qdisc * qdisc)
{
return NULL;
}

static int
noop_requeue(struct sk_buff *skb, struct Qdisc* qdisc)
static int noop_requeue(struct sk_buff *skb, struct Qdisc* qdisc)
{
if (net_ratelimit())
printk(KERN_DEBUG "%s deferred output. It is buggy.\n", skb->dev->name);
printk(KERN_DEBUG "%s deferred output. It is buggy.\n",
skb->dev->name);
kfree_skb(skb);
return NET_XMIT_CN;
}

struct Qdisc_ops noop_qdisc_ops = {
.next = NULL,
.cl_ops = NULL,
.id = "noop",
.priv_size = 0,
.enqueue = noop_enqueue,
Expand All @@ -285,8 +281,6 @@ struct Qdisc noop_qdisc = {
};

static struct Qdisc_ops noqueue_qdisc_ops = {
.next = NULL,
.cl_ops = NULL,
.id = "noqueue",
.priv_size = 0,
.enqueue = noop_enqueue,
Expand Down

0 comments on commit 3b36f71

Please sign in to comment.