--- linux/net/sched/sch_api.c.orig	2005-03-28 16:32:57.000000000 +0300
+++ linux/net/sched/sch_api.c	2005-03-28 16:38:17.000000000 +0300
@@ -404,18 +404,28 @@ qdisc_create(struct net_device *dev, u32
 	struct Qdisc_ops *ops;
 	int size;
 
+	err = -EINVAL;
 	ops = qdisc_lookup_ops(kind);
 #ifdef CONFIG_KMOD
-	if (ops==NULL && tca[TCA_KIND-1] != NULL) {
+	if (ops == NULL && kind != NULL) {
 		char name[IFNAMSIZ];
 		if (rtattr_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) {
+			/* Must drop rtnl sem because request_module
+			 * can try to aquire rtnl sem (see teql for
+			 * example)
+			 */
+			rtnl_unlock();
 			request_module("sch_%s", name);
+			rtnl_lock();
 			ops = qdisc_lookup_ops(kind);
+			if (ops != NULL) {
+				module_put(ops->owner);
+				err = -EAGAIN;
+			}
 		}
 	}
 #endif
 
-	err = -EINVAL;
 	if (ops == NULL)
 		goto err_out;