diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 | 
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 | 
| commit | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (patch) | |
| tree | 465d8631ade6c2fcbd7576ff9813d00116c6a1e8 /drivers/net/wan/lmc/lmc_debug.c | |
| parent | 0753ca7bc2b876dd136e9db11a20f85cbe4e08b1 (diff) | |
| parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/wan/lmc/lmc_debug.c')
| -rw-r--r-- | drivers/net/wan/lmc/lmc_debug.c | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wan/lmc/lmc_debug.c b/drivers/net/wan/lmc/lmc_debug.c index 9dccd9546a1..3b94352b0d0 100644 --- a/drivers/net/wan/lmc/lmc_debug.c +++ b/drivers/net/wan/lmc/lmc_debug.c @@ -8,10 +8,10 @@  /*   * Prints out len, max to 80 octets using printk, 20 per line   */ -void lmcConsoleLog(char *type, unsigned char *ucData, int iLen) -{  #ifdef DEBUG  #ifdef LMC_PACKET_LOG +void lmcConsoleLog(char *type, unsigned char *ucData, int iLen) +{    int iNewLine = 1;    char str[80], *pstr; @@ -43,26 +43,24 @@ void lmcConsoleLog(char *type, unsigned char *ucData, int iLen)      }    sprintf(pstr, "\n");    printk(str); +}  #endif  #endif -}  #ifdef DEBUG  u_int32_t lmcEventLogIndex = 0;  u_int32_t lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS]; -#endif  void lmcEventLog (u_int32_t EventNum, u_int32_t arg2, u_int32_t arg3)  { -#ifdef DEBUG    lmcEventLogBuf[lmcEventLogIndex++] = EventNum;    lmcEventLogBuf[lmcEventLogIndex++] = arg2;    lmcEventLogBuf[lmcEventLogIndex++] = arg3;    lmcEventLogBuf[lmcEventLogIndex++] = jiffies;    lmcEventLogIndex &= (LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS) - 1; -#endif  } +#endif  /*  DEBUG  */  void lmc_trace(struct net_device *dev, char *msg){  #ifdef LMC_TRACE  | 
