diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2016-03-10 14:31:51 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2016-03-10 14:31:51 +0300 |
| commit | d01f9f7161eb5d46a656fd1cff1baf41a65d769f (patch) | |
| tree | 2905f7a5dab7cf16c1e1bcabe437f44073138e76 | |
| parent | b5d340e6dfeedaebbc59b0999545ed5950931a29 (diff) | |
| download | accel-ppp-d01f9f7161eb5d46a656fd1cff1baf41a65d769f.tar.gz accel-ppp-d01f9f7161eb5d46a656fd1cff1baf41a65d769f.zip | |
ipoe_mod: support for 4.4 kernel
| -rw-r--r-- | drivers/ipoe/ipoe.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 260df5eb..dd5120c4 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -486,7 +486,11 @@ static netdev_tx_t ipoe_xmit(struct sk_buff *skb, struct net_device *dev) skb->vlan_tci = 0; skb_set_queue_mapping(skb, 0); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) + ip_local_out(pick_net(skb), skb->sk, skb); +#else ip_local_out(skb); +#endif return NETDEV_TX_OK; } else { @@ -772,8 +776,10 @@ static struct ipoe_session *ipoe_lookup_rt(struct sk_buff *skb, __be32 addr) static unsigned int ipt_in_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *skb)) #elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) static unsigned int ipt_in_hook(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *skb)) -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) static unsigned int ipt_in_hook(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct nf_hook_state *state) +#else +static unsigned int ipt_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) #endif { struct ipoe_session *ses = NULL; @@ -885,8 +891,10 @@ out: static unsigned int ipt_out_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *skb)) #elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) static unsigned int ipt_out_hook(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *skb)) -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) static unsigned int ipt_out_hook(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct nf_hook_state *state) +#else +static unsigned int ipt_out_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) #endif { int noff, iif; @@ -1772,21 +1780,27 @@ static struct nf_hook_ops ipt_ops[] __read_mostly = { .pf = PF_INET, .hooknum = NF_INET_POST_ROUTING, .priority = NF_IP_PRI_LAST, +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) .owner = THIS_MODULE, +#endif }, { .hook = ipt_out_hook, .pf = PF_INET, .hooknum = NF_INET_LOCAL_OUT, .priority = NF_IP_PRI_LAST, +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) .owner = THIS_MODULE, +#endif }, { .hook = ipt_in_hook, .pf = PF_INET, .hooknum = NF_INET_PRE_ROUTING, .priority = NF_IP_PRI_FIRST, +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) .owner = THIS_MODULE, +#endif }, }; |