[svn-commits] sruffell: linux/trunk r8461 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm2...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Sat Apr  3 13:10:27 2010
New Revision: 8461

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8461
Log:
wcte12xp, wtdm24xxp: Make sure the writes are retried.

r8454 and r8460 introduced a change where writes are not retried when other
module/framer commands are retried.  This was an error and wasn't what was
actually under test.  This commit restores the behavior in wctdm24xxp and
makes sure the vpm writes are retried in the wcte12xp.

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.h
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.h?view=diff&rev=8461&r1=8460&r2=8461
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.h Sat Apr  3 13:10:27 2010
@@ -149,11 +149,6 @@
 struct GpakEcanParms;
 void vpmadt032_get_default_parameters(struct GpakEcanParms *p);
 
-static inline int is_cmd_write(const struct vpmadt032_cmd *cmd)
-{
-	return (cmd->desc & __VPM150M_WR) != 0;
-}
-
 /* If there is a command ready to go to the VPMADT032, return it, otherwise NULL */
 static inline struct vpmadt032_cmd *vpmadt032_get_ready_cmd(struct vpmadt032 *vpm)
 {
@@ -166,10 +161,7 @@
 		return NULL;
 	}
 	cmd = list_entry(vpm->pending_cmds.next, struct vpmadt032_cmd, node);
-	if (!is_cmd_write(cmd))
-		list_move_tail(&cmd->node, &vpm->active_cmds);
-	else
-		list_del_init(&cmd->node);
+	list_move_tail(&cmd->node, &vpm->active_cmds);
 	spin_unlock_irqrestore(&vpm->list_lock, flags);
 	return cmd;
 }

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=8461&r1=8460&r2=8461
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Sat Apr  3 13:10:27 2010
@@ -592,9 +592,6 @@
 			writechunk[CMD_BYTE(27, 1, 0)] = 0;
 			writechunk[CMD_BYTE(27, 2, 0)] = 0;
 		}
-		if (is_cmd_write(curcmd))
-			kfree(curcmd);
-
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpmadt032->control)) {
 		for (x = 24; x < 28; x++) {
 			if (x == 24)

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=8461&r1=8460&r2=8461
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Sat Apr  3 13:10:27 2010
@@ -503,9 +503,6 @@
 			writechunk[CMD_BYTE(4, 1, 1)] = 0;
 			writechunk[CMD_BYTE(4, 2, 1)] = 0;
 		}
-		if (is_cmd_write(cmd))
-			kfree(cmd);
-
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpm->control)) {
 		for (x = 0; x < 7; x++) {
 			if (0 == x)  {