diff options
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 8 | ||||
| -rw-r--r-- | include/net/ipip.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index bf14f1f50b90..af74bb3f79d9 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -162,14 +162,6 @@ extern int sysctl_local_port_range[2]; extern int sysctl_ip_default_ttl; #ifdef CONFIG_INET -static inline int ip_send(struct sk_buff *skb) -{ - if (skb->len > skb->dst->pmtu) - return ip_fragment(skb, ip_finish_output); - else - return ip_finish_output(skb); -} - /* The function in 2.2 was invalid, producing wrong result for * check=0xFEFF. It was noticed by Arthur Skawina _year_ ago. --ANK(000625) */ static inline diff --git a/include/net/ipip.h b/include/net/ipip.h index ac6438760b0b..ab54c217d75d 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h @@ -34,7 +34,7 @@ struct ip_tunnel ip_select_ident(iph, &rt->u.dst, NULL); \ ip_send_check(iph); \ \ - err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, do_ip_send); \ + err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, dst_output);\ if (err == NET_XMIT_SUCCESS || err == NET_XMIT_CN) { \ stats->tx_bytes += pkt_len; \ stats->tx_packets++; \ |