[ovs-git] [openvswitch/ovs] fb166e: datapath: Fix compilation on kernel 3.18

GitHub noreply at github.com
Tue Nov 10 16:04:30 UTC 2015

  Branch: refs/heads/branch-2.4
  Home:   https://github.com/openvswitch/ovs
  Commit: fb166e7e505fb957d7c191a5b19064ef2ec999b8
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M .travis.yml
    M acinclude.m4
    M datapath/linux/compat/include/linux/if_vlan.h

  Log Message:
  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 at nicira.com>
Acked-by: Jesse Gross <jesse at nicira.com>

More information about the git mailing list