svn commit: r261009 - stable/10/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Wed Jan 22 09:22:39 2014
New Revision: 261009
URL: http://svnweb.freebsd.org/changeset/base/261009

Log:
  Merge 260225:
  
    Fix circular math macro.
  
  PR:	146082

Modified:
  stable/10/sys/netgraph/ng_l2tp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netgraph/ng_l2tp.c
==============================================================================
--- stable/10/sys/netgraph/ng_l2tp.c	Wed Jan 22 08:33:32 2014	(r261008)
+++ stable/10/sys/netgraph/ng_l2tp.c	Wed Jan 22 09:22:39 2014	(r261009)
@@ -98,7 +98,7 @@ static MALLOC_DEFINE(M_NETGRAPH_L2TP, "n
 #define L2TP_ENABLE_DSEQ	1			/* enable data seq # */
 
 /* Compare sequence numbers using circular math */
-#define L2TP_SEQ_DIFF(x, y)	((int)((int16_t)(x) - (int16_t)(y)))
+#define L2TP_SEQ_DIFF(x, y)	((int16_t)((x) - (y)))
 
 #define SESSHASHSIZE		0x0020
 #define SESSHASH(x)		(((x) ^ ((x) >> 8)) & (SESSHASHSIZE - 1))