git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream
[sfrench/cifs-2.6.git]
/
include
/
linux
/
ibmtr.h
diff --git
a/include/linux/ibmtr.h
b/include/linux/ibmtr.h
index 1c7a0dd5536aca7e8d2a1527ec60e48b0d26736c..06695b74d40585e5ef8428372c6327682745807b 100644
(file)
--- a/
include/linux/ibmtr.h
+++ b/
include/linux/ibmtr.h
@@
-207,7
+207,7
@@
struct tok_info {
unsigned short exsap_station_id;
unsigned short global_int_enable;
struct sk_buff *current_skb;
- struct net_device_stats tr_stats;
+
unsigned char auto_speedsave;
open_state open_status, sap_status;
enum {MANUAL, AUTOMATIC} open_mode;