2014-04-03 16:08:50

by Josh Boyer

Subject: [PATCH] net: cpts: Add includes for ETH_HLEN and VLAN_HLEN definitions

If CONFIG_TI_CPTS is enabled, the ti_cpsw driver will fail to build with:

drivers/net/ethernet/ti/cpts.c: In function 'cpts_match':
drivers/net/ethernet/ti/cpts.c:266:12: error: 'ETH_HLEN' undeclared (first use in this function)
offset = ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
^
drivers/net/ethernet/ti/cpts.c:266:12: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/ethernet/ti/cpts.c:276:23: error: 'VLAN_HLEN' undeclared (first use in this function)
offset = ETH_HLEN + VLAN_HLEN;
^

Add includes of if_ether.h and if_vlan.h to bring in the appropriate defines.

Signed-off-by: Josh Boyer <[email protected]>
---
drivers/net/ethernet/ti/cpts.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index a3bbf59eaafd..2a2f82ae0c1d 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -19,6 +19,8 @@
*/
#include <linux/err.h>
#include <linux/if.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
#include <linux/hrtimer.h>
#include <linux/module.h>
#include <linux/net_tstamp.h>
--
1.8.5.3

2014-04-03 16:30:51

by David Miller

Subject: Re: [PATCH] net: cpts: Add includes for ETH_HLEN and VLAN_HLEN definitions

From: Josh Boyer <[email protected]>
Date: Thu, 3 Apr 2014 12:08:43 -0400

> If CONFIG_TI_CPTS is enabled, the ti_cpsw driver will fail to build with:
>
> drivers/net/ethernet/ti/cpts.c: In function 'cpts_match':
> drivers/net/ethernet/ti/cpts.c:266:12: error: 'ETH_HLEN' undeclared (first use in this function)
> offset = ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
> ^
> drivers/net/ethernet/ti/cpts.c:266:12: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/ethernet/ti/cpts.c:276:23: error: 'VLAN_HLEN' undeclared (first use in this function)
> offset = ETH_HLEN + VLAN_HLEN;
> ^
>
> Add includes of if_ether.h and if_vlan.h to bring in the appropriate defines.
>
> Signed-off-by: Josh Boyer <[email protected]>

A patch for this was already submitted to netdev and applied to the 'net'
GIT tree earlier today.

2014-04-03 16:35:14

by Josh Boyer

Subject: Re: [PATCH] net: cpts: Add includes for ETH_HLEN and VLAN_HLEN definitions

On Thu, Apr 3, 2014 at 12:32 PM, David Miller <[email protected]> wrote:
> From: Josh Boyer <[email protected]>
> Date: Thu, 3 Apr 2014 12:08:43 -0400
>
>> If CONFIG_TI_CPTS is enabled, the ti_cpsw driver will fail to build with:
>>
>> drivers/net/ethernet/ti/cpts.c: In function 'cpts_match':
>> drivers/net/ethernet/ti/cpts.c:266:12: error: 'ETH_HLEN' undeclared (first use in this function)
>> offset = ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
>> ^
>> drivers/net/ethernet/ti/cpts.c:266:12: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/net/ethernet/ti/cpts.c:276:23: error: 'VLAN_HLEN' undeclared (first use in this function)
>> offset = ETH_HLEN + VLAN_HLEN;
>> ^
>>
>> Add includes of if_ether.h and if_vlan.h to bring in the appropriate defines.
>>
>> Signed-off-by: Josh Boyer <[email protected]>
>
> A patch for this was already submitted to netdev and applied to the 'net'
> GIT tree earlier today.

Ah, great. Glad it's covered. Thanks.

josh