diff options
author | Karsten Keil <kkeil@suse.de> | 2007-10-15 05:11:44 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-15 15:26:37 -0400 |
commit | faca94ffaed31528e2e859ee3c26d7d4dba6702f (patch) | |
tree | 16737e9d22b99c8116873586fec8c2813950acb1 /drivers/isdn/i4l/isdn_ppp.c | |
parent | f885c5b08e76f920a4ed4dc63b8b19514272de7b (diff) |
[ISDN]: Remove local copy of device name to make sure renames work.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/i4l/isdn_ppp.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 0e5e59f84344..9f5fe372f83d 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -190,9 +190,11 @@ isdn_ppp_bind(isdn_net_local * lp) | |||
190 | retval = -1; | 190 | retval = -1; |
191 | goto out; | 191 | goto out; |
192 | } | 192 | } |
193 | unit = isdn_ppp_if_get_unit(lp->name); /* get unit number from interface name .. ugly! */ | 193 | /* get unit number from interface name .. ugly! */ |
194 | unit = isdn_ppp_if_get_unit(lp->netdev->dev->name); | ||
194 | if (unit < 0) { | 195 | if (unit < 0) { |
195 | printk(KERN_ERR "isdn_ppp_bind: illegal interface name %s.\n", lp->name); | 196 | printk(KERN_ERR "isdn_ppp_bind: illegal interface name %s.\n", |
197 | lp->netdev->dev->name); | ||
196 | retval = -1; | 198 | retval = -1; |
197 | goto out; | 199 | goto out; |
198 | } | 200 | } |
@@ -507,7 +509,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) | |||
507 | case PPPIOCGIFNAME: | 509 | case PPPIOCGIFNAME: |
508 | if(!lp) | 510 | if(!lp) |
509 | return -EINVAL; | 511 | return -EINVAL; |
510 | if ((r = set_arg(argp, lp->name, strlen(lp->name)))) | 512 | if ((r = set_arg(argp, lp->netdev->dev->name, |
513 | strlen(lp->netdev->dev->name)))) | ||
511 | return r; | 514 | return r; |
512 | break; | 515 | break; |
513 | case PPPIOCGMPFLAGS: /* get configuration flags */ | 516 | case PPPIOCGMPFLAGS: /* get configuration flags */ |