diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-12 13:13:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-12 13:13:01 +1000 |
| commit | 787a85d3e402f046848dbc6d649282ffa3dea5b1 (patch) | |
| tree | 795179d3973eaf4abab549e9995e191de1b8f4cf /include/scsi | |
| parent | 1659d26e9a4585e623e4d431fda0ccf91e49ab6e (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge commit 'net/master'
Conflicts:
drivers/platform/x86/Kconfig
drivers/platform/x86/toshiba_acpi.c
drivers/scsi/fcoe/fcoe.c
include/linux/mmc/sdio_ids.h
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/libfcoe.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index 666cc131732e..b2410605b740 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -73,6 +73,7 @@ enum fip_state { * @link: current link status for libfc. * @last_link: last link state reported to libfc. * @map_dest: use the FC_MAP mode for destination MAC addresses. + * @spma: supports SPMA server-provided MACs mode * @dest_addr: MAC address of the selected FC forwarder. * @ctl_src_addr: the native MAC address of our local port. * @data_src_addr: the assigned MAC address for the local port after FLOGI. @@ -104,6 +105,7 @@ struct fcoe_ctlr { u8 link; u8 last_link; u8 map_dest; + u8 spma; u8 dest_addr[ETH_ALEN]; u8 ctl_src_addr[ETH_ALEN]; u8 data_src_addr[ETH_ALEN]; |