diff options
| author | jfv <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2010-09-28 00:13:15 +0000 |
| commit | 6e3a6af4dca11cb0ff57310539129574a52697ec (patch) | |
| tree | 21280311b19d0a44f429c7a43c6e9ff933e22698 /sys/dev/e1000/e1000_nvm.h | |
| parent | 0d99f2e43e7ec663501399402dc10f4d73b985d4 (diff) | |
| download | FreeBSD-src-6e3a6af4dca11cb0ff57310539129574a52697ec.zip FreeBSD-src-6e3a6af4dca11cb0ff57310539129574a52697ec.tar.gz | |
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
Diffstat (limited to 'sys/dev/e1000/e1000_nvm.h')
| -rw-r--r-- | sys/dev/e1000/e1000_nvm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/e1000/e1000_nvm.h b/sys/dev/e1000/e1000_nvm.h index 974c407..36ee444 100644 --- a/sys/dev/e1000/e1000_nvm.h +++ b/sys/dev/e1000/e1000_nvm.h @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2009, Intel Corporation + Copyright (c) 2001-2010, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -45,6 +45,9 @@ s32 e1000_acquire_nvm_generic(struct e1000_hw *hw); s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg); s32 e1000_read_mac_addr_generic(struct e1000_hw *hw); s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num); +s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num, + u32 pba_num_size); +s32 e1000_read_pba_length_generic(struct e1000_hw *hw, u32 *pba_num_size); s32 e1000_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); s32 e1000_read_nvm_microwire(struct e1000_hw *hw, u16 offset, u16 words, u16 *data); |
