diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:24:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:24:06 -0700 |
| commit | 5f3b28781cbc030351e2fa0712602afbea592aae (patch) | |
| tree | 1387cb2fcea6d4119cd7ad13c76e79c41d5ff4ac /drivers/ieee1394/iso.h | |
| parent | f7ce1f5e083fc099346019fb1f8d56a5452703ed (diff) | |
| parent | e38649702ea64fdbbab3dd459bf8558142dd3bc4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: silence defined but not used warning in non-modular builds
ieee1394: rawiso: requeue packet for transmission after skipped cycle
Diffstat (limited to 'drivers/ieee1394/iso.h')
| -rw-r--r-- | drivers/ieee1394/iso.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ieee1394/iso.h b/drivers/ieee1394/iso.h index b94e55e6eaa..b5de5f21ef7 100644 --- a/drivers/ieee1394/iso.h +++ b/drivers/ieee1394/iso.h @@ -123,6 +123,8 @@ struct hpsb_iso { /* how many times the buffer has overflowed or underflowed */ atomic_t overflows; + /* how many cycles were skipped for a given context */ + atomic_t skips; /* Current number of bytes lost in discarded packets */ int bytes_discarded; |