Message ID | 20090501185532.14602.21059.stgit@fritz |
---|---|
State | Rejected, archived |
Delegated to: | David Miller |
Headers | show |
From: Robert Love <robert.w.love@intel.com> Date: Fri, 01 May 2009 11:55:32 -0700 > 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> You can add this value, when you add the protocol implementation into the upstream sources. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller wrote: > From: Robert Love <robert.w.love@intel.com> > Date: Fri, 01 May 2009 11:55:32 -0700 > >> 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> > > You can add this value, when you add the protocol implementation > into the upstream sources. The FIP implementation is upstream, in drivers/scsi/libfcoe.c. There is a local define in include/scsi/fc/fc_fip.h for ETH_P_FCOE and I'd rather move it to the propper location. include/scsi/fc/fc_fip.h:28:#ifndef ETH_P_FIP include/scsi/fc/fc_fip.h:29:#define ETH_P_FIP 0x8914 /* FIP Ethertype */ One thing to note is that I will later push a patch to linux-scsi to remove the define in fc_fip.h. It may be preferable to do both operations in one patch, but I was worried about cross-subsystem conflicts with other patches to either netdev or fcoe code. I can refresh this patch to include the fc_fip.h removal and you and James can decide who takes the patch if that's a better aproach.-- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Love, Robert W" <robert.w.love@intel.com> Date: Fri, 1 May 2009 15:53:32 -0700 > The FIP implementation is upstream, in drivers/scsi/libfcoe.c. > There is a local define in include/scsi/fc/fc_fip.h for ETH_P_FCOE > and I'd rather move it to the propper location. Then add that local definition removal to your patch so there is no mystery about what this is used for. > I can refresh this patch to include the fc_fip.h removal and you and > James can decide who takes the patch if that's a better aproach. That works much better, and to avoid merge issues you can send it via James with my pre-ack: Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller wrote: > From: "Love, Robert W" <robert.w.love@intel.com> > Date: Fri, 1 May 2009 15:53:32 -0700 > >> The FIP implementation is upstream, in drivers/scsi/libfcoe.c. >> There is a local define in include/scsi/fc/fc_fip.h for ETH_P_FCOE >> and I'd rather move it to the propper location. > > Then add that local definition removal to your patch so there is > no mystery about what this is used for. > >> I can refresh this patch to include the fc_fip.h removal and you and >> James can decide who takes the patch if that's a better aproach. > > That works much better, and to avoid merge issues you can send it > via James with my pre-ack: > > Acked-by: David S. Miller <davem@davemloft.net> Will do, thanks.-- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index cfe4fe1..60e8934 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 ] */ /*