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;