浏览代码

[ATM]: attempt to autoload atm drivers

From: Mitchell Blank Jr <mitch@sfgoth.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Mitchell Blank Jr 19 年之前
父节点
当前提交
50accc9c42
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      net/atm/common.c
  2. 2 1
      net/atm/resources.c

+ 1 - 1
net/atm/common.c

@@ -424,7 +424,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
 	    vcc->qos.rxtp.traffic_class == ATM_ANYCLASS)
 	    vcc->qos.rxtp.traffic_class == ATM_ANYCLASS)
 		return -EINVAL;
 		return -EINVAL;
 	if (likely(itf != ATM_ITF_ANY)) {
 	if (likely(itf != ATM_ITF_ANY)) {
-		dev = atm_dev_lookup(itf);
+		dev = try_then_request_module(atm_dev_lookup(itf), "atm-device-%d", itf);
 	} else {
 	} else {
 		dev = NULL;
 		dev = NULL;
 		spin_lock(&atm_dev_lock);
 		spin_lock(&atm_dev_lock);

+ 2 - 1
net/atm/resources.c

@@ -245,7 +245,8 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
 	if (get_user(number, &sioc->number))
 	if (get_user(number, &sioc->number))
 		return -EFAULT;
 		return -EFAULT;
 
 
-	if (!(dev = atm_dev_lookup(number)))
+	if (!(dev = try_then_request_module(atm_dev_lookup(number),
+					    "atm-device-%d", number)))
 		return -ENODEV;
 		return -ENODEV;
 	
 	
 	switch (cmd) {
 	switch (cmd) {