From 55f503bef3f84079a30c422fee2f18ece1e41cf8 Mon Sep 17 00:00:00 2001 From: Joe Eykholt Date: Wed, 6 May 2009 10:52:51 -0700 Subject: [PATCH] --- yaml --- r: 148108 b: refs/heads/master c: 226c7ffe74474257b4b87bd38ae8ba0030cf65e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/if_ether.h | 1 + trunk/include/scsi/fc/fc_fip.h | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 651dbd7c17cd..58adde9709c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e57e1cbbd1435b523b9cedb949728e9fdcfb5d4 +refs/heads/master: 226c7ffe74474257b4b87bd38ae8ba0030cf65e2 diff --git a/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h index cfe4fe1b7132..60e8934d10b5 100644 --- a/trunk/include/linux/if_ether.h +++ b/trunk/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/trunk/include/scsi/fc/fc_fip.h b/trunk/include/scsi/fc/fc_fip.h index 0627a9ae6347..3d138c1fcf8a 100644 --- a/trunk/include/scsi/fc/fc_fip.h +++ b/trunk/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) */