[svn-commits] tzafrir: branch linux/tzafrir/sysfs r6454 - in /linux/team/tzafrir/sysfs: ./ ...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Apr 22 09:57:50 2009
New Revision: 6454

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6454
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()

Merged revisions 6444 via svnmerge from 
http://svn.digium.com/svn/dahdi/linux/trunk

Modified:
    linux/team/tzafrir/sysfs/   (props changed)
    linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-base.c

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
    automerge = *

Propchange: linux/team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 22 09:57:50 2009
@@ -1,1 +1,1 @@
-/linux/trunk:1-6436
+/linux/trunk:1-6453

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-base.c?view=diff&rev=6454&r1=6453&r2=6454
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-base.c Wed Apr 22 09:57:50 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)
@@ -83,6 +72,18 @@
 #include "ecdis.h"
 
 #include "dahdi-sysfs.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"
 
@@ -1791,7 +1792,7 @@
 	int x,oldbuf;
 	unsigned int fcs;
 	unsigned char *data;
-	long flags;
+	unsigned long flags;
 	int retval = 0;
 
 	/* See if we have any buffers */