diff options
| -rw-r--r-- | gentoo/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild (renamed from gentoo/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild) | 2 | ||||
| -rw-r--r-- | kernel/driver/pptp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gentoo/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild b/gentoo/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild index 06204b0d..7fe4f73a 100644 --- a/gentoo/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild +++ b/gentoo/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL" KEYWORDS="~amd64 ~x86" IUSE="tcpd server" -DEPEND="server? (!net-dialup/pptpd) +DEPEND="server? ( !net-dialup/pptpd ) >=net-dialup/ppp-2.4.2 >=virtual/linux-sources-2.6.15 tcpd? ( sys-apps/tcp-wrappers )" diff --git a/kernel/driver/pptp.c b/kernel/driver/pptp.c index ea4f991c..26886249 100644 --- a/kernel/driver/pptp.c +++ b/kernel/driver/pptp.c @@ -244,7 +244,7 @@ static struct pppox_sock * lookup_chan(u16 call_id, __be32 s_addr) #else read_lock(&chan_lock); #endif - sock=callid_sock[call_id]; + sock = rcu_dereference(callid_sock[call_id]); if (sock) { opt=&sock->proto.pptp; if (opt->dst_addr.sin_addr.s_addr!=s_addr) sock=NULL; |