diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 11:39:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 11:39:09 -0800 |
| commit | 5de76b18d1a7193c49c1a4ee72261421a17de57c (patch) | |
| tree | cd349813d06b8da020aaec0dcc33d499dd80fad5 /drivers/net/igbvf/igbvf.h | |
| parent | 8d0e7fb9d1581c4543ea917c2ea1a50db607a344 (diff) | |
| parent | e1187b3be72be59625e445b186007e6eae27fef1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
be2net: fix error in rx completion processing.
igbvf: avoid reset storms due to mailbox issues
igb: fix handling of mailbox collisions between PF/VF
usb: remove rare pm primitive for conversion to new API
Diffstat (limited to 'drivers/net/igbvf/igbvf.h')
| -rw-r--r-- | drivers/net/igbvf/igbvf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h index 3d1ee7a8478e..a1774b29d222 100644 --- a/drivers/net/igbvf/igbvf.h +++ b/drivers/net/igbvf/igbvf.h @@ -276,6 +276,7 @@ struct igbvf_adapter { unsigned long led_status; unsigned int flags; + unsigned long last_reset; }; struct igbvf_info { |