Commit 6afb7be2 authored by Kai Germaschewski's avatar Kai Germaschewski

ISDN: Remove rcv_waitq/snd_waitq

The arrays were only allocated and initialized, never used.
parent 851785c4
...@@ -570,7 +570,6 @@ isdn_audio_eval_dtmf(modem_info * info) ...@@ -570,7 +570,6 @@ isdn_audio_eval_dtmf(modem_info * info)
/* Schedule dequeuing */ /* Schedule dequeuing */
if ((dev->modempoll) && (info->rcvsched)) if ((dev->modempoll) && (info->rcvsched))
isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1);
wake_up_interruptible(&dev->drv[di]->rcv_waitq[ch]);
} else } else
kfree_skb(skb); kfree_skb(skb);
s->last = what; s->last = what;
...@@ -691,7 +690,6 @@ isdn_audio_put_dle_code(modem_info * info, u_char code) ...@@ -691,7 +690,6 @@ isdn_audio_put_dle_code(modem_info * info, u_char code)
/* Schedule dequeuing */ /* Schedule dequeuing */
if ((dev->modempoll) && (info->rcvsched)) if ((dev->modempoll) && (info->rcvsched))
isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1);
wake_up_interruptible(&dev->drv[di]->rcv_waitq[ch]);
} }
void void
......
...@@ -319,12 +319,9 @@ isdn_receive_skb_callback(int di, int channel, struct sk_buff *skb) ...@@ -319,12 +319,9 @@ isdn_receive_skb_callback(int di, int channel, struct sk_buff *skb)
} }
/* No network-device found, deliver to tty or raw-channel */ /* No network-device found, deliver to tty or raw-channel */
if (skb->len) { if (isdn_tty_rcv_skb(i, di, channel, skb))
if (isdn_tty_rcv_skb(i, di, channel, skb)) return;
return; dev_kfree_skb(skb);
wake_up_interruptible(&dev->drv[di]->rcv_waitq[channel]);
} else
dev_kfree_skb(skb);
} }
/* /*
...@@ -436,7 +433,6 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -436,7 +433,6 @@ isdn_status_callback(isdn_ctrl * c)
return 0; return 0;
if (isdn_tty_stat_callback(i, c)) if (isdn_tty_stat_callback(i, c))
return 0; return 0;
wake_up_interruptible(&dev->drv[di]->snd_waitq[c->arg]);
break; break;
case ISDN_STAT_STAVAIL: case ISDN_STAT_STAVAIL:
save_flags(flags); save_flags(flags);
...@@ -658,7 +654,6 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -658,7 +654,6 @@ isdn_status_callback(isdn_ctrl * c)
for (i = 0; i < dev->drv[di]->channels; i++) for (i = 0; i < dev->drv[di]->channels; i++)
skb_queue_purge(&dev->drv[di]->rpqueue[i]); skb_queue_purge(&dev->drv[di]->rpqueue[i]);
kfree(dev->drv[di]->rpqueue); kfree(dev->drv[di]->rpqueue);
kfree(dev->drv[di]->rcv_waitq);
kfree(dev->drv[di]); kfree(dev->drv[di]);
dev->drv[di] = NULL; dev->drv[di] = NULL;
dev->drvid[di][0] = '\0'; dev->drvid[di][0] = '\0';
...@@ -1701,24 +1696,6 @@ isdn_add_channels(driver *d, int drvidx, int n, int adding) ...@@ -1701,24 +1696,6 @@ isdn_add_channels(driver *d, int drvidx, int n, int adding)
skb_queue_head_init(&d->rpqueue[j]); skb_queue_head_init(&d->rpqueue[j]);
} }
if ((adding) && (d->rcv_waitq))
kfree(d->rcv_waitq);
d->rcv_waitq = kmalloc(sizeof(wait_queue_head_t) * 2 * m, GFP_KERNEL);
if (!d->rcv_waitq) {
printk(KERN_WARNING "register_isdn: Could not alloc rcv_waitq\n");
if (!adding) {
kfree(d->rpqueue);
kfree(d->rcvcount);
kfree(d->rcverr);
}
return -1;
}
d->snd_waitq = d->rcv_waitq + m;
for (j = 0; j < m; j++) {
init_waitqueue_head(&d->rcv_waitq[j]);
init_waitqueue_head(&d->snd_waitq[j]);
}
dev->channels += n; dev->channels += n;
save_flags(flags); save_flags(flags);
cli(); cli();
......
...@@ -434,8 +434,6 @@ typedef struct { ...@@ -434,8 +434,6 @@ typedef struct {
unsigned long DLEflag; /* Flags: Insert DLE at next read */ unsigned long DLEflag; /* Flags: Insert DLE at next read */
#endif #endif
struct sk_buff_head *rpqueue; /* Pointers to start of Rcv-Queue */ struct sk_buff_head *rpqueue; /* Pointers to start of Rcv-Queue */
wait_queue_head_t *rcv_waitq; /* Wait-Queues for B-Channel-Reads */
wait_queue_head_t *snd_waitq; /* Wait-Queue for B-Channel-Send's */
char msn2eaz[10][ISDN_MSNLEN]; /* Mapping-Table MSN->EAZ */ char msn2eaz[10][ISDN_MSNLEN]; /* Mapping-Table MSN->EAZ */
} driver; } driver;
......
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