On 3/3/2017 3:17 AM, Qi Zhang wrote: > Some defines were previously wrapped to strip them from opensource driver > builds, but these are required by DPDK. Change the wrapping of these so > that the DPDK gets them as long as DPDK_SUPPORT is correctly added as a > strip flag, while we can remove the reduandant ones in fm10k_osdep.h.
s/reduandant/redundant > > Signed-off-by: Qi Zhang <qi.z.zh...@intel.com> <...> > diff --git a/drivers/net/fm10k/base/fm10k_type.h > b/drivers/net/fm10k/base/fm10k_type.h > index fe3e498..8ddfd49 100644 > --- a/drivers/net/fm10k/base/fm10k_type.h > +++ b/drivers/net/fm10k/base/fm10k_type.h > @@ -40,6 +40,9 @@ struct fm10k_hw; > #include "fm10k_osdep.h" > #include "fm10k_mbx.h" > > +#if !defined(EXTERNAL_RELEASE) || defined(DPDK_SUPPORT) >From commit log what I understand is, released code is coming from a shared code by some #ifdefs stripped based on a strip flag configuration. If that is the case, these #ifdefs should not be released code, they should be stripped but only #defines should remain, is this correct? > +#define FM10K_INTEL_VENDOR_ID 0x8086 > +#endif > #define FM10K_DEV_ID_PF 0x15A4 > #define FM10K_DEV_ID_VF 0x15A5 > #ifdef BOULDER_RAPIDS_HW <...>
