Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / drivers / isdn / i4l / isdn_net.c

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index d9aebbc510cc77d4116fa17c5349034f329e2362..94affa5e6f2895725c6f61c9d53b8b988b1a9bca 100644 (file)
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2588,7 +2588,8 @@ isdn_net_new(char *name, struct net_device *master)
                printk(KERN_WARNING "isdn_net: Could not allocate net-device\n");
                return NULL;
        }
-       netdev->dev = alloc_netdev(sizeof(isdn_net_local), name, _isdn_setup);
+       netdev->dev = alloc_netdev(sizeof(isdn_net_local), name,
+                                  NET_NAME_UNKNOWN, _isdn_setup);
        if (!netdev->dev) {
                printk(KERN_WARNING "isdn_net: Could not allocate network device\n");
                kfree(netdev);
@@ -2917,8 +2918,8 @@ isdn_net_getcfg(isdn_net_ioctl_cfg *cfg)
                        cfg->callback = 2;
                cfg->cbhup = (lp->flags & ISDN_NET_CBHUP) ? 1 : 0;
                cfg->dialmode = lp->flags & ISDN_NET_DIALMODE_MASK;
-               cfg->chargehup = (lp->hupflags & 4) ? 1 : 0;
-               cfg->ihup = (lp->hupflags & 8) ? 1 : 0;
+               cfg->chargehup = (lp->hupflags & ISDN_CHARGEHUP) ? 1 : 0;
+               cfg->ihup = (lp->hupflags & ISDN_INHUP) ? 1 : 0;
                cfg->cbdelay = lp->cbdelay;
                cfg->dialmax = lp->dialmax;
                cfg->triggercps = lp->triggercps;