diff options
| author | Joe Eykholt <jeykholt@cisco.com> | 2009-05-06 10:52:51 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-08 13:29:17 -0500 |
| commit | 226c7ffe74474257b4b87bd38ae8ba0030cf65e2 (patch) | |
| tree | e48c457df4b121cbbb47582446a11b23e7df2c14 /include | |
| parent | 4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4 (diff) | |
| download | linux-stable-226c7ffe74474257b4b87bd38ae8ba0030cf65e2.tar.gz linux-stable-226c7ffe74474257b4b87bd38ae8ba0030cf65e2.tar.bz2 linux-stable-226c7ffe74474257b4b87bd38ae8ba0030cf65e2.zip | |
[SCSI] net, libfcoe: Add the FCoE Initialization Protocol ethertype
FIP is the FCoE Initialization Protocol and this patch
adds the protocol ethertype to the kernel's list of
ethertypes.
Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_ether.h | 1 | ||||
| -rw-r--r-- | include/scsi/fc/fc_fip.h | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index cfe4fe1b7132..60e8934d10b5 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -79,6 +79,7 @@ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ #define ETH_P_TIPC 0x88CA /* TIPC */ #define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ /* diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h index 0627a9ae6347..3d138c1fcf8a 100644 --- a/include/scsi/fc/fc_fip.h +++ b/include/scsi/fc/fc_fip.h @@ -22,13 +22,6 @@ * http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf */ -/* - * The FIP ethertype eventually goes in net/if_ether.h. - */ -#ifndef ETH_P_FIP -#define ETH_P_FIP 0x8914 /* FIP Ethertype */ -#endif - #define FIP_DEF_PRI 128 /* default selection priority */ #define FIP_DEF_FC_MAP 0x0efc00 /* default FCoE MAP (MAC OUI) value */ #define FIP_DEF_FKA 8000 /* default FCF keep-alive/advert period (mS) */ |