[svn-commits] sruffell: branch linux/sruffell/chan_list_refactoring r9269 - in /linux/team/...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Sep  2 12:41:01 2010
New Revision: 9269

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9269
Log:
dahdi: Remove the capability to perform indirect channel ioctls.

Modified:
    linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c
    linux/team/sruffell/chan_list_refactoring/include/dahdi/user.h

Modified: linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c?view=diff&rev=9269&r1=9268&r2=9269
==============================================================================
--- linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c Thu Sep  2 12:41:01 2010
@@ -4440,15 +4440,6 @@
 	int rv;
 	struct dahdi_span *s;
 	switch(cmd) {
-	case DAHDI_INDIRECT:
-	{
-		struct dahdi_indirect_data ind;
-
-		if (copy_from_user(&ind, user_data, sizeof(ind)))
-			return -EFAULT;
-		VALID_CHANNEL(ind.chan);
-		return dahdi_chan_ioctl(file, ind.op, (unsigned long) ind.data, ind.chan);
-	}
 	case DAHDI_SPANCONFIG:
 	{
 		struct dahdi_lineconfig lc;

Modified: linux/team/sruffell/chan_list_refactoring/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/chan_list_refactoring/include/dahdi/user.h?view=diff&rev=9269&r1=9268&r2=9269
==============================================================================
--- linux/team/sruffell/chan_list_refactoring/include/dahdi/user.h (original)
+++ linux/team/sruffell/chan_list_refactoring/include/dahdi/user.h Thu Sep  2 12:41:01 2010
@@ -954,18 +954,6 @@
 #define DAHDI_SETSIGFREEZE 		_IOW(DAHDI_CODE, 54, int)
 
 /*
- * Perform an indirect ioctl (on a specified channel via master interface)
- */
-struct dahdi_indirect_data {
-	int	chan;
-	int	op;
-	void	*data;
-};
-
-#define DAHDI_INDIRECT 			_IOWR(DAHDI_CODE, 56, struct dahdi_indirect_data)
-
-
-/*
  * Get the version of DAHDI that is running, and a description
  * of the compiled-in echo cancellers (if any)
  */