[svn-commits] tzafrir: linux/trunk r5046 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Fri Oct  3 15:16:24 2008
New Revision: 5046

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5046
Log:
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.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=5046&r1=5045&r2=5046
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Oct  3 15:16:24 2008
@@ -1532,8 +1532,8 @@
 	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 @@
 	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 @@
 		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);