[dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Pawel Wodkowski]

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
---
 lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
 lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
index 9adc6aa..ebd0e93 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
+++ b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
@@ -36,6 +36,10 @@
 
 #include <rte_ether.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Actor/partner states
  */
@@ -211,4 +215,8 @@ int
 rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
 		struct rte_eth_bond_8023ad_slave_info *conf);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */
diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h b/lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h
index 8adee70..7930345 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h
+++ b/lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h
@@ -42,6 +42,10 @@
 
 #include "rte_eth_bond_8023ad.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BOND_MODE_8023AX_UPDATE_TIMEOUT_MS  100
 /** Maximum number of packets to one slave queued in TX ring. */
 #define BOND_MODE_8023AX_SLAVE_RX_PKTS        3
@@ -305,4 +309,8 @@ bond_mode_8023ad_deactivate_slave(struct rte_eth_dev *dev, uint8_t slave_pos);
 void
 bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */
-- 
1.7.9.5

Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Thomas Monjalon]

Hi Pawel,

> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> ---
>  lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
>  lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++

Why adding extern C in a private header file?

-- 
Thomas

Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Wodkowski, PawelX]

> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Friday, January 30, 2015 11:21 AM
> To: Wodkowski, PawelX
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header
> files
> 
> Hi Pawel,
> 
> > Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> > ---
> >  lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
> >  lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++
> 
> Why adding extern C in a private header file?
> 
> --
> Thomas

To be consistent with rte_eth_bond_private.h where it is included.


-- 
Pawel

Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Declan Doherty]

On 30/01/15 10:56, Wodkowski, PawelX wrote:
>> -----Original Message-----
>> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
>> Sent: Friday, January 30, 2015 11:21 AM
>> To: Wodkowski, PawelX
>> Cc: dev@dpdk.org
>> Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header
>> files
>>
>> Hi Pawel,
>>
>>> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
>>> ---
>>>   lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
>>>   lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++
>>
>> Why adding extern C in a private header file?
>>
>> --
>> Thomas
>
> To be consistent with rte_eth_bond_private.h where it is included.
>
>

We only need the decls on the public headers exported by the 
librte_pmd_bond makefile, so there is no need to modify 
rte_eth_bond_private.h as it should never be linked to directly by 
external code.

Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Wodkowski, PawelX]

> -----Original Message-----
> From: Doherty, Declan
> Sent: Friday, January 30, 2015 12:42 PM
> To: Wodkowski, PawelX; Thomas Monjalon
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header
> files
> 
> On 30/01/15 10:56, Wodkowski, PawelX wrote:
> >> -----Original Message-----
> >> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> >> Sent: Friday, January 30, 2015 11:21 AM
> >> To: Wodkowski, PawelX
> >> Cc: dev@dpdk.org
> >> Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4
> header
> >> files
> >>
> >> Hi Pawel,
> >>
> >>> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> >>> ---
> >>>   lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
> >>>   lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++
> >>
> >> Why adding extern C in a private header file?
> >>
> >> --
> >> Thomas
> >
> > To be consistent with rte_eth_bond_private.h where it is included.
> >
> >
> 
> We only need the decls on the public headers exported by the
> librte_pmd_bond makefile, so there is no need to modify
> rte_eth_bond_private.h as it should never be linked to directly by
> external code.

I modified rte_eth_bond_8023ad_private.h not rte_eth_bond_private.h.
In rte_eth_bond_private.h those declarations are present already.
If so those declarations should be removed from rte_eth_bond_private.h.

I can do this in v2 if you accept this.

Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header files

[Declan Doherty]

On 30/01/15 12:11, Wodkowski, PawelX wrote:
> > -----Original Message-----
> > From: Doherty, Declan
> > Sent: Friday, January 30, 2015 12:42 PM
> > To: Wodkowski, PawelX; Thomas Monjalon
> > Cc: dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4 header
> > files
> >
> > On 30/01/15 10:56, Wodkowski, PawelX wrote:
> >>> -----Original Message-----
> >>> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> >>> Sent: Friday, January 30, 2015 11:21 AM
> >>> To: Wodkowski, PawelX
> >>> Cc: dev@dpdk.org
> >>> Subject: Re: [dpdk-dev] [PATCH] Added missing extern 'C' decls in mode4
> > header
> >>> files
> >>>
> >>> Hi Pawel,
> >>>
> >>>> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> >>>> ---
> >>>>    lib/librte_pmd_bond/rte_eth_bond_8023ad.h         |    8 ++++++++
> >>>>    lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h |    8 ++++++++
> >>>
> >>> Why adding extern C in a private header file?
> >>>
> >>> --
> >>> Thomas
> >>
> >> To be consistent with rte_eth_bond_private.h where it is included.
> >>
> >>
> >
> > We only need the decls on the public headers exported by the
> > librte_pmd_bond makefile, so there is no need to modify
> > rte_eth_bond_private.h as it should never be linked to directly by
> > external code.
>
> I modified rte_eth_bond_8023ad_private.h not rte_eth_bond_private.h.
> In rte_eth_bond_private.h those declarations are present already.
> If so those declarations should be removed from rte_eth_bond_private.h.
>
> I can do this in v2 if you accept this.
>
Sure, that sounds good to me.

[dpdk-dev] [PATCH v2] bond: fix 'extern "C"' decls in mode4 header files

[Pawel Wodkowski]

v2:
 Remove 'extern "C"' declarations from bond private header files.

v1:
 Add missing declarations to rte_bond_8023ad.h.

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
---
 lib/librte_pmd_bond/rte_eth_bond_8023ad.h  | 8 ++++++++
 lib/librte_pmd_bond/rte_eth_bond_private.h | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
index 9adc6aa..ebd0e93 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
+++ b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
@@ -36,6 +36,10 @@
 
 #include <rte_ether.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Actor/partner states
  */
@@ -211,4 +215,8 @@ int
 rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
 		struct rte_eth_bond_8023ad_slave_info *conf);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */
diff --git a/lib/librte_pmd_bond/rte_eth_bond_private.h b/lib/librte_pmd_bond/rte_eth_bond_private.h
index e01e66b..3da5a9e 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_private.h
+++ b/lib/librte_pmd_bond/rte_eth_bond_private.h
@@ -34,10 +34,6 @@
 #ifndef _RTE_ETH_BOND_PRIVATE_H_
 #define _RTE_ETH_BOND_PRIVATE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rte_ethdev.h>
 #include <rte_spinlock.h>
 
@@ -276,8 +272,4 @@ int
 bond_ethdev_parse_time_ms_kvarg(const char *key __rte_unused,
 		const char *value, void *extra_args);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
-- 
1.9.1

Re: [dpdk-dev] [PATCH v2] bond: fix 'extern "C"' decls in mode4 header files

[Declan Doherty]

On 30/01/15 13:21, Pawel Wodkowski wrote:
> v2:
>   Remove 'extern "C"' declarations from bond private header files.
>
> v1:
>   Add missing declarations to rte_bond_8023ad.h.
>
> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> ---
>   lib/librte_pmd_bond/rte_eth_bond_8023ad.h  | 8 ++++++++
>   lib/librte_pmd_bond/rte_eth_bond_private.h | 8 --------
>   2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
> index 9adc6aa..ebd0e93 100644
> --- a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
> +++ b/lib/librte_pmd_bond/rte_eth_bond_8023ad.h
> @@ -36,6 +36,10 @@
>
>   #include <rte_ether.h>
>
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
>   /**
>    * Actor/partner states
>    */
> @@ -211,4 +215,8 @@ int
>   rte_eth_bond_8023ad_slave_info(uint8_t port_id, uint8_t slave_id,
>   		struct rte_eth_bond_8023ad_slave_info *conf);
>
> +#ifdef __cplusplus
> +}
> +#endif
> +
>   #endif /* RTE_ETH_BOND_8023AD_H_ */
> diff --git a/lib/librte_pmd_bond/rte_eth_bond_private.h b/lib/librte_pmd_bond/rte_eth_bond_private.h
> index e01e66b..3da5a9e 100644
> --- a/lib/librte_pmd_bond/rte_eth_bond_private.h
> +++ b/lib/librte_pmd_bond/rte_eth_bond_private.h
> @@ -34,10 +34,6 @@
>   #ifndef _RTE_ETH_BOND_PRIVATE_H_
>   #define _RTE_ETH_BOND_PRIVATE_H_
>
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> -
>   #include <rte_ethdev.h>
>   #include <rte_spinlock.h>
>
> @@ -276,8 +272,4 @@ int
>   bond_ethdev_parse_time_ms_kvarg(const char *key __rte_unused,
>   		const char *value, void *extra_args);
>
> -#ifdef __cplusplus
> -}
> -#endif
> -
>   #endif
>

Acked-by: Declan Doherty <declan.doherty@intel.com>