Commit faca94ff authored by Karsten Keil's avatar Karsten Keil Committed by David S. Miller

[ISDN]: Remove local copy of device name to make sure renames work.

Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f885c5b0
This diff is collapsed.
...@@ -190,9 +190,11 @@ isdn_ppp_bind(isdn_net_local * lp) ...@@ -190,9 +190,11 @@ isdn_ppp_bind(isdn_net_local * lp)
retval = -1; retval = -1;
goto out; goto out;
} }
unit = isdn_ppp_if_get_unit(lp->name); /* get unit number from interface name .. ugly! */ /* get unit number from interface name .. ugly! */
unit = isdn_ppp_if_get_unit(lp->netdev->dev->name);
if (unit < 0) { if (unit < 0) {
printk(KERN_ERR "isdn_ppp_bind: illegal interface name %s.\n", lp->name); printk(KERN_ERR "isdn_ppp_bind: illegal interface name %s.\n",
lp->netdev->dev->name);
retval = -1; retval = -1;
goto out; goto out;
} }
...@@ -507,7 +509,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) ...@@ -507,7 +509,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
case PPPIOCGIFNAME: case PPPIOCGIFNAME:
if(!lp) if(!lp)
return -EINVAL; return -EINVAL;
if ((r = set_arg(argp, lp->name, strlen(lp->name)))) if ((r = set_arg(argp, lp->netdev->dev->name,
strlen(lp->netdev->dev->name))))
return r; return r;
break; break;
case PPPIOCGMPFLAGS: /* get configuration flags */ case PPPIOCGMPFLAGS: /* get configuration flags */
......
...@@ -286,7 +286,6 @@ typedef struct { ...@@ -286,7 +286,6 @@ typedef struct {
/* Local interface-data */ /* Local interface-data */
typedef struct isdn_net_local_s { typedef struct isdn_net_local_s {
ulong magic; ulong magic;
char name[10]; /* Name of device */
struct net_device_stats stats; /* Ethernet Statistics */ struct net_device_stats stats; /* Ethernet Statistics */
int isdn_device; /* Index to isdn-device */ int isdn_device; /* Index to isdn-device */
int isdn_channel; /* Index to isdn-channel */ int isdn_channel; /* Index to isdn-channel */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment