diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-22 12:53:49 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-22 12:53:49 +0000 |
| commit | 611a7ef087ff3376cbf655d6d0d2b0cfdc69e525 (patch) | |
| tree | e1b1ed94c09ee34ff2ebdf8ce60a68a72ca1c413 | |
| parent | 922f6cd14bbd573abcd11b78973efc00b80a3dc0 (diff) | |
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()
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6444 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 02850fc..e9316a8 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -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) @@ -82,6 +71,18 @@ #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" /* Get helper arithmetic */ @@ -1783,7 +1784,7 @@ static int dahdi_ppp_xmit(struct ppp_channel *ppp, struct sk_buff *skb) int x,oldbuf; unsigned int fcs; unsigned char *data; - long flags; + unsigned long flags; int retval = 0; /* See if we have any buffers */ |