From fa28381c983d10edf938afad5e5e61331ed9f920 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Sat, 18 Apr 2015 09:28:46 +0300 Subject: ipoe: fixed compiling driver for 3.10 kernel --- drivers/ipoe/ipoe.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers') 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; -- cgit v1.2.3