diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-10-03 20:16:24 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-10-03 20:16:24 +0000 |
| commit | 8e423b37b882ed9d6175ea4592c768d87b87ddf6 (patch) | |
| tree | 79fb79e40611b616e3905d6285dca6bf0b7b06f0 /drivers | |
| parent | f4b3ccbbb4babe4c36fbf617ea834395898673e1 (diff) | |
Fix building with CONFIG_DAHDI_NET . It builds, but will it run?
Patch dahdi-base.c.hdlc.patch by biohumanoid that fixes some aparant
copy&paste errors.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5046 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 5593adf..017a72f 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -1532,8 +1532,8 @@ static int dahdi_net_open(hdlc_device *hdlc) if (res) return res; - fasthdlc_init(&ms->rxhdlc, (chan->flags & DAHDI_FLAG_HDLC56) ? FASTHDLC_MODE_56 : FASTHDLC_MODE_64); - fasthdlc_init(&ms->txhdlc, (chan->flags & DAHDI_FLAG_HDLC56) ? FASTHDLC_MODE_56 : FASTHDLC_MODE_64); + fasthdlc_init(&ms->rxhdlc, (ms->flags & DAHDI_FLAG_HDLC56) ? FASTHDLC_MODE_56 : FASTHDLC_MODE_64); + fasthdlc_init(&ms->txhdlc, (ms->flags & DAHDI_FLAG_HDLC56) ? FASTHDLC_MODE_56 : FASTHDLC_MODE_64); ms->infcs = PPP_INITFCS; netif_start_queue(ztchan_to_dev(ms)); @@ -1637,7 +1637,7 @@ static struct dahdi_hdlc *dahdi_hdlc_alloc(void) return kzalloc(sizeof(struct dahdi_hdlc), GFP_KERNEL); } -static inline print_debug_writebuf(struct dahdi_chan* ss, struct sk_buff *skb, +static inline void print_debug_writebuf(struct dahdi_chan* ss, struct sk_buff *skb, int oldbuf) { #ifdef CONFIG_DAHDI_DEBUG @@ -1711,7 +1711,7 @@ static int dahdi_xmit(hdlc_device *hdlc, struct sk_buff *skb) dev->trans_start = jiffies; stats->tx_packets++; stats->tx_bytes += ss->writen[oldbuf]; - print_debug_writebuf(ss, skb, outbuf); + print_debug_writebuf(ss, skb, oldbuf); retval = 0; /* Free the SKB */ dev_kfree_skb_any(skb); |