git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IPVS]: Replace local version of skb_make_writable
[pandora-kernel.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_xmit.c
diff --git
a/net/ipv4/ipvs/ip_vs_xmit.c
b/net/ipv4/ipvs/ip_vs_xmit.c
index
900ce29
..
afd90d4
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_xmit.c
+++ b/
net/ipv4/ipvs/ip_vs_xmit.c
@@
-128,7
+128,7
@@
ip_vs_dst_reset(struct ip_vs_dest *dest)
#define IP_VS_XMIT(skb, rt) \
do { \
(skb)->ipvs_property = 1; \
#define IP_VS_XMIT(skb, rt) \
do { \
(skb)->ipvs_property = 1; \
-
(skb)->ip_summed = CHECKSUM_NONE;
\
+
skb_forward_csum(skb);
\
NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, (skb), NULL, \
(rt)->u.dst.dev, dst_output); \
} while (0)
NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, (skb), NULL, \
(rt)->u.dst.dev, dst_output); \
} while (0)
@@
-253,7
+253,7
@@
ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
}
/* copy-on-write the packet before mangling it */
}
/* copy-on-write the packet before mangling it */
- if (!
ip_vs_make_skb_writable(&
skb, sizeof(struct iphdr)))
+ if (!
skb_make_writable(
skb, sizeof(struct iphdr)))
goto tx_error_put;
if (skb_cow(skb, rt->u.dst.dev->hard_header_len))
goto tx_error_put;
if (skb_cow(skb, rt->u.dst.dev->hard_header_len))
@@
-529,7
+529,7
@@
ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
}
/* copy-on-write the packet before mangling it */
}
/* copy-on-write the packet before mangling it */
- if (!
ip_vs_make_skb_writable(&
skb, offset))
+ if (!
skb_make_writable(
skb, offset))
goto tx_error_put;
if (skb_cow(skb, rt->u.dst.dev->hard_header_len))
goto tx_error_put;
if (skb_cow(skb, rt->u.dst.dev->hard_header_len))