please apply to 2.6 -- thanks!
[ATM]: attempt to autoload atm drivers
From: Mitchell Blank Jr <[EMAIL PROTECTED]>
Signed-off-by: Chas Williams <[EMAIL PROTECTED]>
---
commit 4727673d1a795cd8d5dee1904571b76d2ba532ed
tree bfce97de4ef2bef8ac8ebc9853a449f9ce5426d6
parent d86bc37841a99650cb17debfaa1ed59f7a9a4431
author chas williams <[EMAIL PROTECTED](none)> Sat, 26 Nov 2005 15:47:14 -0500
committer chas williams <[EMAIL PROTECTED](none)> Sat, 26 Nov 2005 15:47:14
-0500
net/atm/common.c | 2 +-
net/atm/resources.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/atm/common.c b/net/atm/common.c
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -424,7 +424,7 @@ int vcc_connect(struct socket *sock, int
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
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -245,7 +245,8 @@ int atm_dev_ioctl(unsigned int cmd, void
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) {
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
