diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/scsi/fc/fc_fcoe.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/scsi/fc/fc_fcoe.h')
| -rw-r--r-- | include/scsi/fc/fc_fcoe.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h index 57aaa8f0d613..ccb3dbe90463 100644 --- a/include/scsi/fc/fc_fcoe.h +++ b/include/scsi/fc/fc_fcoe.h | |||
| @@ -25,17 +25,6 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | * The FCoE ethertype eventually goes in net/if_ether.h. | ||
| 29 | */ | ||
| 30 | #ifndef ETH_P_FCOE | ||
| 31 | #define ETH_P_FCOE 0x8906 /* FCOE ether type */ | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #ifndef ETH_P_8021Q | ||
| 35 | #define ETH_P_8021Q 0x8100 | ||
| 36 | #endif | ||
| 37 | |||
| 38 | /* | ||
| 39 | * FC_FCOE_OUI hasn't been standardized yet. XXX TBD. | 28 | * FC_FCOE_OUI hasn't been standardized yet. XXX TBD. |
| 40 | */ | 29 | */ |
| 41 | #ifndef FC_FCOE_OUI | 30 | #ifndef FC_FCOE_OUI |