diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/s390/cio/qdio.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'drivers/s390/cio/qdio.c')
| -rw-r--r-- | drivers/s390/cio/qdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 7c93a8798d23..cde822d8b5c8 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
| @@ -115,7 +115,7 @@ qdio_min(int a,int b) | |||
| 115 | static inline __u64 | 115 | static inline __u64 |
| 116 | qdio_get_micros(void) | 116 | qdio_get_micros(void) |
| 117 | { | 117 | { |
| 118 | return (get_clock() >> 10); /* time>>12 is microseconds */ | 118 | return (get_clock() >> 12); /* time>>12 is microseconds */ |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| @@ -1129,7 +1129,7 @@ out: | |||
| 1129 | 1129 | ||
| 1130 | #ifdef QDIO_USE_PROCESSING_STATE | 1130 | #ifdef QDIO_USE_PROCESSING_STATE |
| 1131 | if (last_position>=0) | 1131 | if (last_position>=0) |
| 1132 | set_slsb(q, &last_position, SLSB_P_INPUT_NOT_INIT, &count); | 1132 | set_slsb(q, &last_position, SLSB_P_INPUT_PROCESSING, &count); |
| 1133 | #endif /* QDIO_USE_PROCESSING_STATE */ | 1133 | #endif /* QDIO_USE_PROCESSING_STATE */ |
| 1134 | 1134 | ||
| 1135 | QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int)); | 1135 | QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int)); |