git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
drivers
/
net
/
s2io.h
diff --git
a/drivers/net/s2io.h
b/drivers/net/s2io.h
index
6722a2f
..
47c36e0
100644
(file)
--- a/
drivers/net/s2io.h
+++ b/
drivers/net/s2io.h
@@
-18,15
+18,6
@@
#define vBIT(val, loc, sz) (((u64)val) << (64-loc-sz))
#define INV(d) ((d&0xff)<<24) | (((d>>8)&0xff)<<16) | (((d>>16)&0xff)<<8)| ((d>>24)&0xff)
#define vBIT(val, loc, sz) (((u64)val) << (64-loc-sz))
#define INV(d) ((d&0xff)<<24) | (((d>>8)&0xff)<<16) | (((d>>16)&0xff)<<8)| ((d>>24)&0xff)
-#ifndef BOOL
-#define BOOL int
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
#undef SUCCESS
#define SUCCESS 0
#define FAILURE -1
#undef SUCCESS
#define SUCCESS 0
#define FAILURE -1
@@
-73,7
+64,10
@@
enum {
static int debug_level = ERR_DBG;
/* DEBUG message print. */
static int debug_level = ERR_DBG;
/* DEBUG message print. */
-#define DBG_PRINT(dbg_level, args...) if(!(debug_level<dbg_level)) printk(args)
+#define DBG_PRINT(dbg_level, fmt, args...) do { \
+ if (dbg_level >= debug_level) \
+ pr_info(fmt, ##args); \
+ } while (0)
/* Protocol assist features of the NIC */
#define L3_CKSUM_OK 0xFFFF
/* Protocol assist features of the NIC */
#define L3_CKSUM_OK 0xFFFF
@@
-962,6
+956,7
@@
struct s2io_nic {
int task_flag;
unsigned long long start_time;
struct vlan_group *vlgrp;
int task_flag;
unsigned long long start_time;
struct vlan_group *vlgrp;
+ int vlan_strip_flag;
#define MSIX_FLG 0xA5
int num_entries;
struct msix_entry *entries;
#define MSIX_FLG 0xA5
int num_entries;
struct msix_entry *entries;