Permalink
Browse files

ubuntu kernel 4.2.0-27 compilation fix

  • Loading branch information...
cardigliano committed Jul 11, 2016
1 parent f5fbb56 commit e40b06114251cfa8f4a5713eb25a9c8a0ef98308
Showing with 4 additions and 4 deletions.
  1. +4 −4 kernel/pf_ring.c
View
@@ -6962,8 +6962,8 @@ static int ring_setsockopt(struct socket *sock,
printk("[PF_RING] BPF filter (len = %u)\n", fprog.len);
#if (defined(UTS_UBUNTU_RELEASE_ABI) && (\
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,2,0) && UTS_UBUNTU_RELEASE_ABI > 26) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,4,0) && UTS_UBUNTU_RELEASE_ABI > 21) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,2,0) && UTS_UBUNTU_RELEASE_ABI >= 28) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,4,0) && UTS_UBUNTU_RELEASE_ABI >= 22) || \
UBUNTU_VERSION_CODE > KERNEL_VERSION(4,4,0))) || \
(!defined(UTS_UBUNTU_RELEASE_ABI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
ret = __sk_attach_filter(&fprog, pfr->sk, sock_owned_by_user(pfr->sk));
@@ -6980,8 +6980,8 @@ static int ring_setsockopt(struct socket *sock,
if (unlikely(enable_debug))
printk("[PF_RING] Removing BPF filter\n");
#if (defined(UTS_UBUNTU_RELEASE_ABI) && (\
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,2,0) && UTS_UBUNTU_RELEASE_ABI > 26) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,4,0) && UTS_UBUNTU_RELEASE_ABI > 21) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,2,0) && UTS_UBUNTU_RELEASE_ABI >= 28) || \
(UBUNTU_VERSION_CODE == KERNEL_VERSION(4,4,0) && UTS_UBUNTU_RELEASE_ABI >= 22) || \
UBUNTU_VERSION_CODE > KERNEL_VERSION(4,4,0))) || \
(!defined(UTS_UBUNTU_RELEASE_ABI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
ret = __sk_detach_filter(pfr->sk, sock_owned_by_user(pfr->sk));

0 comments on commit e40b061

Please sign in to comment.