[Pkg-voip-commits] r6478 - /dahdi-linux/trunk/debian/patches/bri_dchan

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Nov 17 15:41:54 2008
New Revision: 6478

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6478
Log:
Refresh patch bri_dpatch.

Modified:
    dahdi-linux/trunk/debian/patches/bri_dchan

Modified: dahdi-linux/trunk/debian/patches/bri_dchan
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/bri_dchan?rev=6478&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/bri_dchan (original)
+++ dahdi-linux/trunk/debian/patches/bri_dchan Mon Nov 17 15:41:54 2008
@@ -19,7 +19,7 @@
  	spinlock_t lock;
  	char name[40];
  	/* Specified by DAHDI */
-@@ -486,6 +493,9 @@ enum {
+@@ -462,6 +469,9 @@ enum {
  	DAHDI_FLAGBIT_LOOPED	= 18,	/*!< Loopback the receive data from the channel to the transmit */
  	DAHDI_FLAGBIT_MTP2	= 19,	/*!< Repeats last message in buffer and also discards repeating messages sent to us */
  	DAHDI_FLAGBIT_HDLC56	= 20,	/*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K  */
@@ -29,7 +29,7 @@
  };
  
  /* map flagbits to flag masks */
-@@ -500,6 +500,7 @@
+@@ -500,6 +510,7 @@ enum {
  #define DAHDI_FLAG_LOOPED	DAHDI_FLAG(LOOPED)
  #define DAHDI_FLAG_MTP2		DAHDI_FLAG(MTP2)
  #define DAHDI_FLAG_HDLC56	DAHDI_FLAG(HDLC56)
@@ -39,7 +39,7 @@
  	spinlock_t lock;
 --- a/drivers/dahdi/dahdi_config.h
 +++ b/drivers/dahdi/dahdi_config.h
-@@ -169,4 +169,10 @@
+@@ -174,4 +174,10 @@
   */
  /* #define	OPTIMIZE_CHANMUTE */
  
@@ -52,7 +52,7 @@
  #endif
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
-@@ -5863,11 +5863,40 @@ static inline void __dahdi_getbuf_chunk(
+@@ -5907,11 +5907,40 @@ static inline void __dahdi_getbuf_chunk(
  					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
  				}
  				bytes -= left;
@@ -93,7 +93,7 @@
  			}
  			/* Check buffer status */
  			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -5924,6 +5953,17 @@ out in the later versions, and is put ba
+@@ -5968,6 +5997,17 @@ out in the later versions, and is put ba
  				/* Transmit a flag if this is an HDLC channel */
  				if (ms->flags & DAHDI_FLAG_HDLC)
  					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
@@ -111,7 +111,7 @@
  #ifdef CONFIG_DAHDI_NET
  				if (ms->flags & DAHDI_FLAG_NETDEV)
  					netif_wake_queue(ztchan_to_dev(ms));
-@@ -5984,6 +6024,12 @@ out in the later versions, and is put ba
+@@ -6028,6 +6068,12 @@ out in the later versions, and is put ba
  				memset(txb, 0xFF, bytes);
  			}
  			bytes = 0;
@@ -124,7 +124,7 @@
  		} else {
  			memset(txb, DAHDI_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
  			bytes = 0;
-@@ -6796,6 +6842,14 @@ static inline void __putbuf_chunk(struct
+@@ -6840,6 +6886,14 @@ static inline void __putbuf_chunk(struct
  	int res;
  	int left, x;
  
@@ -139,7 +139,7 @@
  	while(bytes) {
  #if defined(CONFIG_DAHDI_NET)  || defined(CONFIG_DAHDI_PPP)
  		skb = NULL;
-@@ -6853,6 +6907,19 @@ static inline void __putbuf_chunk(struct
+@@ -6897,6 +6951,19 @@ static inline void __putbuf_chunk(struct
  						}
  					}
  				}