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_gred.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_gred.c')
| -rw-r--r-- | net/sched/sch_gred.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 3a9d226ff1e4..c89fba56db56 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
| @@ -582,7 +582,8 @@ append_opt: | |||
| 582 | return nla_nest_end(skb, opts); | 582 | return nla_nest_end(skb, opts); |
| 583 | 583 | ||
| 584 | nla_put_failure: | 584 | nla_put_failure: |
| 585 | return nla_nest_cancel(skb, opts); | 585 | nla_nest_cancel(skb, opts); |
| 586 | return -EMSGSIZE; | ||
| 586 | } | 587 | } |
| 587 | 588 | ||
| 588 | static void gred_destroy(struct Qdisc *sch) | 589 | static void gred_destroy(struct Qdisc *sch) |