Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/drivers/ipoe/ipoe.c.orig 2015-04-03 08:18:59.000000000 +0300
- +++ b/drivers/ipoe/ipoe.c 2015-04-03 08:19:46.025491924 +0300
- @@ -423,7 +423,6 @@
- struct iphdr *iph;
- struct ethhdr *eth;
- struct sk_buff *skb1;
- - struct dst_entry *dst;
- /*struct arphdr *arp;
- unsigned char *arp_ptr;
- __be32 tip;*/
- @@ -452,18 +451,6 @@
- stats->tx_bytes += skb->len - ETH_HLEN;
- #endif
- -
- -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
- - dst = skb_dst(skb);
- -#else
- - dst = skb->dst;
- -#endif
- - if (dst && dst->dev != skb->dev) {
- - skb->dev = dst->dev;
- - dev_queue_xmit(skb);
- - return NETDEV_TX_OK;
- - }
- -
- //pr_info("ipoe: xmit1 %08x %08x\n", iph->saddr, iph->daddr);
- if (iph->daddr == ses->addr) {
- if (skb_shared(skb)) {
- @@ -871,7 +858,7 @@
- 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))
- #endif
- {
- - int noff, iif;
- + int noff;
- struct iphdr *iph;
- struct ipoe_session *ses;
- unsigned char *cb_ptr;
- @@ -903,18 +890,6 @@
- if (!ses)
- return NF_ACCEPT;
- -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)
- - iif = skb->skb_iif;
- -#else
- - iif = skb->iif;
- -#endif
- -
- - if (iif == ses->dev->ifindex) {
- - atomic_dec(&ses->refs);
- - return NF_ACCEPT;
- - }
- -
- - skb->dev = ses->dev;
- atomic_dec(&ses->refs);
- return NF_ACCEPT;
Advertisement
Add Comment
Please, Sign In to add comment