diff options
| author | Jack F Vogel <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
|---|---|---|
| committer | Jack F Vogel <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
| commit | 7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4 (patch) | |
| tree | 21280311b19d0a44f429c7a43c6e9ff933e22698 /sys/dev/e1000/if_em.h | |
| parent | 332bbeddddc50b02d0123c9973f5875d4e68e006 (diff) | |
| download | src-7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4.tar.gz src-7d9119bdc4774dc34eeac8fea0d3e0fe8c704fc4.zip | |
Update code from Intel:
- Sync shared code with Intel internal
- New client chipset support added
- em driver - fixes to 82574, limit queues to 1 but use MSIX
- em driver - large changes in TX checksum offload and tso
code, thanks to yongari.
- some small changes for watchdog issues.
- igb driver - local timer watchdog code was missing locking
this and a couple other watchdog related fixes.
- bug in rx discard found by Andrew Boyer, check for null pointer
MFC: a week
Notes
Notes:
svn path=/head/; revision=213234
Diffstat (limited to 'sys/dev/e1000/if_em.h')
| -rw-r--r-- | sys/dev/e1000/if_em.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 229cc0cc392c..fec34acd7c52 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -284,6 +284,10 @@ struct tx_ring { volatile u16 tx_avail; u32 tx_tso; /* last tx was tso */ u16 last_hw_offload; + u8 last_hw_ipcso; + u8 last_hw_ipcss; + u8 last_hw_tucso; + u8 last_hw_tucss; #if __FreeBSD_version >= 800000 struct buf_ring *br; #endif @@ -355,6 +359,7 @@ struct adapter { int if_flags; int max_frame_size; int min_frame_size; + int pause_frames; struct mtx core_mtx; int em_insert_vlan_header; u32 ims; |