[svn-commits] kpfleming: linux/trunk r6444 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Apr 22 07:53:49 2009
New Revision: 6444

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6444
Log:
don't refer to macros from dahdi_config.h until after it has been included

use the proper type for the flags variable in dahdi_ppp_xmit()


Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=6444&r1=6443&r2=6444
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Apr 22 07:53:49 2009
@@ -47,17 +47,6 @@
 #include <linux/moduleparam.h>
 #include <linux/list.h>
 
-#ifdef CONFIG_DAHDI_NET
-#include <linux/netdevice.h>
-#endif /* CONFIG_DAHDI_NET */
-
-#include <linux/ppp_defs.h>
-#ifdef CONFIG_DAHDI_PPP
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
-#endif
-
 #include <asm/atomic.h>
 
 #define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
@@ -81,6 +70,18 @@
 #define FAST_HDLC_NEED_TABLES
 #include <dahdi/kernel.h>
 #include "ecdis.h"
+
+#ifdef CONFIG_DAHDI_NET
+#include <linux/netdevice.h>
+#endif /* CONFIG_DAHDI_NET */
+
+#include <linux/ppp_defs.h>
+
+#ifdef CONFIG_DAHDI_PPP
+#include <linux/netdevice.h>
+#include <linux/if.h>
+#include <linux/if_ppp.h>
+#endif
 
 #include "hpec/hpec_user.h"
 
@@ -1783,7 +1784,7 @@
 	int x,oldbuf;
 	unsigned int fcs;
 	unsigned char *data;
-	long flags;
+	unsigned long flags;
 	int retval = 0;
 
 	/* See if we have any buffers */