VirtualBox

Changeset 58845 in vbox


Ignore:
Timestamp:
Nov 25, 2015 9:29:56 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
104319
Message:

Linux hosts/guests: fix for EL7.2 Linux kernel

Location:
trunk/src/VBox
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

    r58129 r58845  
    7171#endif
    7272
     73#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     74# ifdef RHEL_RELEASE_CODE
     75#  if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7, 2)
     76#   define DRM_HAVE_DRM_MAP
     77#  endif
     78# else
     79#  define DRM_HAVE_DRM_MAP
     80# endif
     81#endif
     82
    7383static struct pci_device_id pciidlist[] = {
    7484        vboxvideo_PCI_IDS
     
    90100        .release = drm_release,
    91101        .unlocked_ioctl = drm_ioctl,
    92 # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     102# ifdef DRM_HAVE_DRM_MAP
    93103        /* This shouldn't be necessary even for old kernels as there is
    94104         * nothing sensible to mmap. But we play safe and keep it for
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

    r58656 r58845  
    6868
    6969
    70 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
    71 # define vlan_tx_tag_get(skb)       skb_vlan_tag_get(skb)
    72 # define vlan_tx_tag_present(skb)   skb_vlan_tag_present(skb)
    73 #endif
    74 
    75 
    7670/*********************************************************************************************************************************
    7771*   Defined Constants And Macros                                                                                                 *
     
    129123#endif
    130124
     125#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
     126# define VBOX_HAVE_SKB_VLAN
     127#else
     128# ifdef RHEL_RELEASE_CODE
     129#  if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 2)
     130#   define VBOX_HAVE_SKB_VLAN
     131#  endif
     132# endif
     133#endif
     134
     135#ifdef VBOX_HAVE_SKB_VLAN
     136# define vlan_tx_tag_get(skb)       skb_vlan_tag_get(skb)
     137# define vlan_tx_tag_present(skb)   skb_vlan_tag_present(skb)
     138#endif
     139
    131140#ifndef NET_IP_ALIGN
    132141# define NET_IP_ALIGN 2
     
    140149
    141150#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18)
     151
    142152/** Indicates that the linux kernel may send us GSO frames. */
    143153# define VBOXNETFLT_WITH_GSO                1
     
    157167# define VBOXNETFLT_WITH_GSO_RECV           1
    158168
    159 #endif
     169#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) */
    160170
    161171#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
     
    163173# define VBOXNETFLT_WITH_GRO                1
    164174#endif
     175
    165176/*
    166177 * GRO support was backported to RHEL 5.4
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette