summaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorMitchell Blank Jr <mitch@sfgoth.com>2005-11-29 16:15:18 -0800
committerDavid S. Miller <davem@davemloft.net>2005-11-29 16:15:18 -0800
commit50accc9c428273501dd2a6295c84a533dd1fe645 (patch)
tree54a94b2c84b3a7af78887383b4c828e0a4953fe1 /net/atm
parente91a73568b19b4a8145fc6e05314d522ee35a0b1 (diff)
downloadop-kernel-dev-50accc9c428273501dd2a6295c84a533dd1fe645.zip
op-kernel-dev-50accc9c428273501dd2a6295c84a533dd1fe645.tar.gz
[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>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/common.c2
-rw-r--r--net/atm/resources.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index 83454e1..db9318f 100644
--- a/net/atm/common.c
+++ b/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)
return -EINVAL;
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 {
dev = NULL;
spin_lock(&atm_dev_lock);
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 415d261..35f3ceb 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -245,7 +245,8 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
if (get_user(number, &sioc->number))
return -EFAULT;
- if (!(dev = atm_dev_lookup(number)))
+ if (!(dev = try_then_request_module(atm_dev_lookup(number),
+ "atm-device-%d", number)))
return -ENODEV;
switch (cmd) {
OpenPOWER on IntegriCloud