datapath: Fix compilation on kernel 3.18
authorPravin B Shelar <pshelar@nicira.com>
Fri, 18 Sep 2015 22:23:21 +0000 (15:23 -0700)
committerPravin B Shelar <pshelar@nicira.com>
Tue, 22 Sep 2015 21:21:25 +0000 (14:21 -0700)
commitec96e6637630d33301540993509c5b037b3c422d
treec2e4fa0e726d8f07f1ecb59750463b8d49e0ed98
parentae09fae8a6b43299a628ae0989fe2fedb924d560
datapath: Fix compilation on kernel 3.18

Fixes following compilation error:
In file included from ovs/datapath/linux/actions.c:30: ovs/datapath/linux/compat/include/linux/if_vlan.h:65:
error: redefinition of ‘__vlan_hwaccel_push_inside’ include/linux/if_vlan.h:353: note: previous definition of
‘__vlan_hwaccel_push_inside’ was here ovs/datapath/linux/compat/include/linux/if_vlan.h:83:

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
.travis.yml
acinclude.m4
datapath/linux/compat/include/linux/if_vlan.h