diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /net/sched/sch_red.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'net/sched/sch_red.c')
| -rw-r--r-- | net/sched/sch_red.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 3dcd493f4f4a..5c569853b9c0 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
| @@ -281,7 +281,8 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
| 281 | return nla_nest_end(skb, opts); | 281 | return nla_nest_end(skb, opts); |
| 282 | 282 | ||
| 283 | nla_put_failure: | 283 | nla_put_failure: |
| 284 | return nla_nest_cancel(skb, opts); | 284 | nla_nest_cancel(skb, opts); |
| 285 | return -EMSGSIZE; | ||
| 285 | } | 286 | } |
| 286 | 287 | ||
| 287 | static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d) | 288 | static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d) |