summaryrefslogtreecommitdiff
path: root/drivers/ipoe/ipoe.c
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2015-04-18 09:28:46 +0300
committerDmitry Kozlov <xeb@mail.ru>2015-04-18 09:28:46 +0300
commitfa28381c983d10edf938afad5e5e61331ed9f920 (patch)
treed61f71405aaa786be88c59310b63982205331d08 /drivers/ipoe/ipoe.c
parent3e886b631e0684c689b8075778be505ae9ae7629 (diff)
downloadaccel-ppp-xebd-fa28381c983d10edf938afad5e5e61331ed9f920.tar.gz
accel-ppp-xebd-fa28381c983d10edf938afad5e5e61331ed9f920.zip
ipoe: fixed compiling driver for 3.10 kernel
Diffstat (limited to 'drivers/ipoe/ipoe.c')
-rw-r--r--drivers/ipoe/ipoe.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
index 910e725..e13ec85 100644
--- a/drivers/ipoe/ipoe.c
+++ b/drivers/ipoe/ipoe.c
@@ -157,6 +157,13 @@ static struct genl_multicast_group ipoe_nl_mcg;
#define u64_stats_fetch_retry_bh u64_stats_fetch_retry_irq
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+#ifndef u64_stats_fetch_begin_bh
+#define u64_stats_fetch_begin_bh u64_stats_fetch_begin_irq
+#define u64_stats_fetch_retry_bh u64_stats_fetch_retry_irq
+#endif
+#endif
+
static inline int hash_addr(__be32 addr)
{
#ifdef __LITTLE_ENDIAN
@@ -243,12 +250,6 @@ static int ipoe_check_interface(int ifindex)
return r;
}
-#ifndef u64_stats_fetch_begin_bh
-#define u64_stats_fetch_begin_bh u64_stats_fetch_begin_irq
-#define u64_stats_fetch_retry_bh u64_stats_fetch_retry_irq
-#endif
-
-
static int ipoe_do_nat(struct sk_buff *skb, __be32 new_addr, int to_peer)
{
struct iphdr *iph;