wctc4xxp: Clear packet error count when reloading firmware.

When the firmware is reloaded and reset, the packet error count is not.
This can create a condition where the firmware could report an error like
the following if a channel was closed without any new errors:

  wctc4xxp 0000:07:08.0: 18446744073709551597 errored receive packets

wcdte.packet_errors is also renamed to wcdte.reported_packet_errors to not
conflict with the packet_errors member of the descriptor lists.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
(cherry picked from commit d5f13c5116)

README

@@ -12,16 +12,6 @@ Supported Hardware
 ------------------
 Digital Cards
 ~~~~~~~~~~~~~
-- wcte43x:
-  * Digium TE435: PCI express quad-port T1/E1/J1
-  * Digium TE436: PCI quad-port T1/E1/J1
-  * Digium TE235: PCI express dual-port T1/E1/J1
-  * Digium TE236: PCI dual-port T1/E1/J1
-- wcte13xp:
-  * Digium TE131: PCI express single-port T1/E1/J1
-  * Digium TE133: PCI express single-port T1/E1/J1 with echocan
-  * Digium TE132: PCI single-port T1/E1/J1
-  * Digium TE134: PCI single-port T1/E1/J1 with echocan
 - wct4xxp:
   * Digium TE205P/TE207P/TE210P/TE212P: PCI dual-port T1/E1/J1
   * Digium TE405P/TE407P/TE410P/TE412P: PCI quad-port T1/E1/J1
@@ -44,11 +34,6 @@ Digital Cards
 
 Analog Cards
 ~~~~~~~~~~~~
-- wcaxx:
-  * Digium A8A: PCI up to 8 mixed FXS/FXO ports
-  * Digium A8B: PCI express up to 8 mixed FXS/FXO ports
-  * Digium A4A: PCI up to 4 mixed FXS/FXO ports
-  * Digium A4B: PCI express up to 4 mixed FXS/FXO ports 
 - wctdm24xxp: 
   * Digium TDM2400P/AEX2400: up to 24 analog ports
   * Digium TDM800P/AEX800: up to 8 analog ports

build_tools/make_version

@@ -2,18 +2,119 @@
 
 if [ -f ${1}/.version ]; then
 	cat ${1}/.version
+elif [ -f ${1}/.svnrevision ]; then
+	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
+elif [ -d ${1}/.svn ]; then
+    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'`
+    BRANCH=0
+    TEAM=0
+    
+    REV=`svnversion -c ${1} | cut -d: -f2`
+    
+    if [ "${PARTS}" = "trunk" ]
+	then
+	echo SVN-'trunk'-r${REV}
+	exit 0
+    fi
+    
+    for PART in $PARTS
+      do
+      if [ ${BRANCH} != 0 ]
+	  then
+	  RESULT="${RESULT}-${PART}"
+	  break
+      fi
+      
+      if [ ${TEAM} != 0 ]
+	  then
+	  RESULT="${RESULT}-${PART}"
+	  continue
+      fi
+      
+      if [ "${PART}" = "branches" ]
+	  then
+	  BRANCH=1
+	  RESULT="branch"
+	  continue
+      fi
+      
+      if [ "${PART}" = "tags" ]
+	  then
+	  BRANCH=1
+	  RESULT="tag"
+	  continue
+      fi
+      
+      if [ "${PART}" = "team" ]
+	  then
+	  TEAM=1
+	  continue
+      fi
+    done
+    
+    echo SVN-${RESULT##-}-r${REV}
 elif [ -d ${1}/.git ]; then
-    VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
-    if [ $? -ne 0 ]; then
-        MODIFIED=""
+    # If the first log commit messages indicates that this is checked into
+    # subversion, we'll just use the SVN- form of the revision.
+    MODIFIED=""
+    SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
+    if [ -z "$SVN_REV" ]; then
+        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
+        if [ $? -ne 0 ]; then
+            if [ "`git ls-files -m | wc -l`" != "0" ]; then
+                MODIFIED="M"
+            fi
+            # Some older versions of git do not support all the above
+            # options.
+            VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
+        fi
+        echo ${VERSION}
+    else
+        PARTS=`LANG=C git log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
+        BRANCH=0
+        TEAM=0
+
         if [ "`git ls-files -m | wc -l`" != "0" ]; then
             MODIFIED="M"
         fi
-        # Some older versions of git do not support all the above
-        # options.
-        VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
+
+        if [ "${PARTS}" = "trunk" ]; then
+            echo SVN-'trunk'-r${SVN_REV}${MODIFIED}
+            exit 0
+        fi
+
+        for PART in $PARTS
+          do
+              if [ ${BRANCH} != 0 ]; then
+              RESULT="${RESULT}-${PART}"
+              break
+          fi
+
+          if [ ${TEAM} != 0 ]; then
+              RESULT="${RESULT}-${PART}"
+              continue
+          fi
+
+          if [ "${PART}" = "branches" ]; then
+              BRANCH=1
+              RESULT="branch"
+              continue
+          fi
+
+          if [ "${PART}" = "tags" ]; then
+              BRANCH=1
+              RESULT="tag"
+              continue
+          fi
+
+          if [ "${PART}" = "team" ]; then
+              TEAM=1
+              continue
+          fi
+        done
+
+        echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
     fi
-    echo ${VERSION}
 else
 	# Use the directory information in the absence of any other version
 	# information

drivers/dahdi/oct612x/oct612x-user.c

@@ -22,7 +22,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 
 #include <dahdi/kernel.h>
 

drivers/dahdi/wcb4xxp/wcb4xxp.h

@@ -248,8 +248,8 @@
 #define V_ROUT_TX_STIO2		(0x3 << 6)	/* output data to STIO2 */
 #define V_ROUT_RX_DIS		(0x0 << 6)	/* disabled, input data ignored */
 #define V_ROUT_RX_LOOP		(0x1 << 6)	/* internally looped, input data ignored */
-#define V_ROUT_RX_STIO2		(0x2 << 6)	/* channel data from STIO2 */
-#define V_ROUT_RX_STIO1		(0x3 << 6)	/* channel data from STIO1 */
+#define V_ROUT_RX_STIO2		(0x2 << 6)	/* channel data comes from STIO1 */
+#define V_ROUT_RX_STIO1		(0x3 << 6)	/* channel data comes from STIO2 */
 
 #define V_CH_SNUM_SHIFT		(1)
 #define V_CH_SNUM_MASK		(31 << 1)
@@ -367,16 +367,6 @@
 #define V_B2_RX_EN		(1 << 1)	/* 1=enable B2 RX */
 #define V_ST_TRI		(1 << 6)	/* 1=tristate S/T output buffer */
 
-/* User Flash Manager */
-#define UFM_PROGRAM	(1<<0)
-#define UFM_ERASE	(1<<1)
-#define UFM_DRSHIFT	(1<<2)
-#define UFM_DRDIN	(1<<3)
-#define UFM_DRCLK	(1<<4)
-#define UFM_ARSHIFT	(1<<5)
-#define UFM_ARDIN	(1<<6)
-#define UFM_ARCLK	(1<<7)
-
 #define NUM_REGS 0xff
 #define NUM_PCI 12
 
@@ -395,8 +385,7 @@
 
 struct b4xxp_span {
 	struct b4xxp *parent;
-	int port;				/* virtual port */
-	int phy_port;				/* physical port */
+	int port;				/* which S/T port this span belongs to */
 
 	unsigned char writechunk[WCB4XXP_CHANNELS_PER_SPAN * DAHDI_CHUNKSIZE];
 	unsigned char readchunk[WCB4XXP_CHANNELS_PER_SPAN * DAHDI_CHUNKSIZE];
@@ -437,9 +426,7 @@ enum cards_ids {	/* Cards ==> Brand & Model 		*/
 	BN4S0,		/* Beronet BN4S0			*/
 	BN8S0,		/* BeroNet BN8S0			*/
 	BSWYX_SX2,	/* Swyx 4xS0 SX2 QuadBri		*/
-	QUADBRI_EVAL,	/* HFC-4S CCD Eval. Board		*/
-	B430P,		/* Digium B430P				*/
-	B230P		/* Digium B230P				*/
+	QUADBRI_EVAL	/* HFC-4S CCD Eval. Board		*/
 	};
 
 /* This structure exists one per card */