From e0b627b67d678993f87daeb3ac1ef34c68cb6ddb Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Wed, 3 Dec 2008 15:49:07 -0800 Subject: [PATCH] --- yaml --- r: 122432 b: refs/heads/master c: 25dd7e6aedff054736f9edfd05bb585d810d8543 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/isdn/hysdn/hysdn_net.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95a54b586245..1825bcd5e01d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52404881984e2d447f920a23e3bb63262dfc77f3 +refs/heads/master: 25dd7e6aedff054736f9edfd05bb585d810d8543 diff --git a/trunk/drivers/isdn/hysdn/hysdn_net.c b/trunk/drivers/isdn/hysdn/hysdn_net.c index cfa8fa5e44ab..5b4ae67339af 100644 --- a/trunk/drivers/isdn/hysdn/hysdn_net.c +++ b/trunk/drivers/isdn/hysdn/hysdn_net.c @@ -76,7 +76,7 @@ static int net_open(struct net_device *dev) { struct in_device *in_dev; - hysdn_card *card = dev->priv; + hysdn_card *card = dev->ml_priv; int i; netif_start_queue(dev); /* start tx-queueing */ @@ -159,7 +159,7 @@ net_send_packet(struct sk_buff *skb, struct net_device *dev) spin_unlock_irq(&lp->lock); if (lp->sk_count <= 3) { - schedule_work(&((hysdn_card *) dev->priv)->irq_queue); + schedule_work(&((hysdn_card *) dev->ml_priv)->irq_queue); } return (0); /* success */ } /* net_send_packet */ @@ -295,7 +295,7 @@ hysdn_net_create(hysdn_card * card) kfree(dev); return (i); } - dev->priv = card; /* remember pointer to own data structure */ + dev->ml_priv = card; /* remember pointer to own data structure */ card->netif = dev; /* setup the local pointer */ if (card->debug_flags & LOG_NET_INIT)