diff options
| author | Herbert Xu | 2007-10-14 09:39:33 +0200 |
|---|---|---|
| committer | David S. Miller | 2007-10-15 21:26:28 +0200 |
| commit | af1e1cf073e3d038b7aac417a20585ecdcab7de6 (patch) | |
| tree | 2a9eaba23f721fd59160d77cbaaa643ad44f8f76 /net/ipv4/ipvs/ip_vs_proto_tcp.c | |
| parent | [NETFILTER]: Do not copy skb in skb_make_writable (diff) | |
| download | kernel-qcow2-linux-af1e1cf073e3d038b7aac417a20585ecdcab7de6.tar.gz kernel-qcow2-linux-af1e1cf073e3d038b7aac417a20585ecdcab7de6.tar.xz kernel-qcow2-linux-af1e1cf073e3d038b7aac417a20585ecdcab7de6.zip | |
[IPVS]: Replace local version of skb_make_writable
This patch removes the IPVS-specific version of skb_make_writable and
replaces it with the netfilter one.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_proto_tcp.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto_tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c index e65577a77006..b65b1a352ba3 100644 --- a/net/ipv4/ipvs/ip_vs_proto_tcp.c +++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c @@ -20,6 +20,7 @@ #include <linux/tcp.h> /* for tcphdr */ #include <net/ip.h> #include <net/tcp.h> /* for csum_tcpudp_magic */ +#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <net/ip_vs.h> @@ -129,7 +130,7 @@ tcp_snat_handler(struct sk_buff **pskb, const unsigned int tcphoff = ip_hdrlen(*pskb); /* csum_check requires unshared skb */ - if (!ip_vs_make_skb_writable(pskb, tcphoff+sizeof(*tcph))) + if (!skb_make_writable(*pskb, tcphoff+sizeof(*tcph))) return 0; if (unlikely(cp->app != NULL)) { @@ -177,7 +178,7 @@ tcp_dnat_handler(struct sk_buff **pskb, const unsigned int tcphoff = ip_hdrlen(*pskb); /* csum_check requires unshared skb */ - if (!ip_vs_make_skb_writable(pskb, tcphoff+sizeof(*tcph))) + if (!skb_make_writable(*pskb, tcphoff+sizeof(*tcph))) return 0; if (unlikely(cp->app != NULL)) { |