Changeset 58845 in vbox
- Timestamp:
- Nov 25, 2015 9:29:56 AM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 104319
- Location:
- trunk/src/VBox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c
r58129 r58845 71 71 #endif 72 72 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 73 83 static struct pci_device_id pciidlist[] = { 74 84 vboxvideo_PCI_IDS … … 90 100 .release = drm_release, 91 101 .unlocked_ioctl = drm_ioctl, 92 # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)102 # ifdef DRM_HAVE_DRM_MAP 93 103 /* This shouldn't be necessary even for old kernels as there is 94 104 * nothing sensible to mmap. But we play safe and keep it for -
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
r58656 r58845 68 68 69 69 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 #endif74 75 76 70 /********************************************************************************************************************************* 77 71 * Defined Constants And Macros * … … 129 123 #endif 130 124 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 131 140 #ifndef NET_IP_ALIGN 132 141 # define NET_IP_ALIGN 2 … … 140 149 141 150 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) 151 142 152 /** Indicates that the linux kernel may send us GSO frames. */ 143 153 # define VBOXNETFLT_WITH_GSO 1 … … 157 167 # define VBOXNETFLT_WITH_GSO_RECV 1 158 168 159 #endif 169 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) */ 160 170 161 171 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) … … 163 173 # define VBOXNETFLT_WITH_GRO 1 164 174 #endif 175 165 176 /* 166 177 * GRO support was backported to RHEL 5.4
Note:
See TracChangeset
for help on using the changeset viewer.