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

GitHub noreply at github.com
Tue Sep 22 21:22:04 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: ec96e6637630d33301540993509c5b037b3c422d
      https://github.com/openvswitch/ovs/commit/ec96e6637630d33301540993509c5b037b3c422d
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-09-22 (Tue, 22 Sep 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