Permalink
Browse files

mainstream kernel 4.4 compilation fix

  • Loading branch information...
cardigliano committed Jul 11, 2016
1 parent e40b061 commit 7677ce2961c6ceab96824460c471ea3c2e3f4f56
Showing with 2 additions and 2 deletions.
  1. +2 −2 kernel/pf_ring.c
View
@@ -6965,7 +6965,7 @@ static int ring_setsockopt(struct socket *sock,
(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))
(!defined(UTS_UBUNTU_RELEASE_ABI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,8))
ret = __sk_attach_filter(&fprog, pfr->sk, sock_owned_by_user(pfr->sk));
#else
ret = sk_attach_filter(&fprog, pfr->sk);
@@ -6983,7 +6983,7 @@ static int ring_setsockopt(struct socket *sock,
(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))
(!defined(UTS_UBUNTU_RELEASE_ABI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,8))
ret = __sk_detach_filter(pfr->sk, sock_owned_by_user(pfr->sk));
#else
ret = sk_detach_filter(pfr->sk);

0 comments on commit 7677ce2

Please sign in to comment.