From e19e6f9fa7e8bdeadb3129a87eb8125b873b91da Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Fri, 27 Feb 2009 02:42:38 -0800
Subject: [PATCH] --- yaml --- r: 131959 b: refs/heads/master c:
 1844f747947bb89d7f12cd3034548805113f764b h: refs/heads/master i:   131957:
 cdeb22dd2193f42a31af80dae811fe72679c60ed   131955:
 9935f7d3b02e1289bfc42556b835cd214c764887   131951:
 515e7ab046e97ecde8ca0a62954078e431cf9e3d v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_drr.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 668bb0be7a08..16488ef508ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e92aa634a33739478958f4109d6bd35b36d13532
+refs/heads/master: 1844f747947bb89d7f12cd3034548805113f764b
diff --git a/trunk/net/sched/sch_drr.c b/trunk/net/sched/sch_drr.c
index f6b4fa97df70..e36e94ab4e10 100644
--- a/trunk/net/sched/sch_drr.c
+++ b/trunk/net/sched/sch_drr.c
@@ -66,11 +66,15 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
 {
 	struct drr_sched *q = qdisc_priv(sch);
 	struct drr_class *cl = (struct drr_class *)*arg;
+	struct nlattr *opt = tca[TCA_OPTIONS];
 	struct nlattr *tb[TCA_DRR_MAX + 1];
 	u32 quantum;
 	int err;
 
-	err = nla_parse_nested(tb, TCA_DRR_MAX, tca[TCA_OPTIONS], drr_policy);
+	if (!opt)
+		return -EINVAL;
+
+	err = nla_parse_nested(tb, TCA_DRR_MAX, opt, drr_policy);
 	if (err < 0)
 		return err;