projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
net
/
netfilter
/
xt_TCPMSS.c
diff --git
a/net/netfilter/xt_TCPMSS.c
b/net/netfilter/xt_TCPMSS.c
index
db7e38c
..
15fe8f6
100644
(file)
--- a/
net/netfilter/xt_TCPMSS.c
+++ b/
net/netfilter/xt_TCPMSS.c
@@
-54,7
+54,7
@@
tcpmss_mangle_packet(struct sk_buff **pskb,
return -1;
tcplen = (*pskb)->len - tcphoff;
return -1;
tcplen = (*pskb)->len - tcphoff;
- tcph = (struct tcphdr *)(
(*pskb)->nh.raw
+ tcphoff);
+ tcph = (struct tcphdr *)(
skb_network_header(*pskb)
+ tcphoff);
/* Since it passed flags test in tcp match, we know it is is
not a fragment, and has data >= tcp header length. SYN
/* Since it passed flags test in tcp match, we know it is is
not a fragment, and has data >= tcp header length. SYN
@@
-113,7
+113,7
@@
tcpmss_mangle_packet(struct sk_buff **pskb,
return -1;
kfree_skb(*pskb);
*pskb = newskb;
return -1;
kfree_skb(*pskb);
*pskb = newskb;
- tcph = (struct tcphdr *)(
(*pskb)->nh.raw
+ tcphoff);
+ tcph = (struct tcphdr *)(
skb_network_header(*pskb)
+ tcphoff);
}
skb_put((*pskb), TCPOLEN_MSS);
}
skb_put((*pskb), TCPOLEN_MSS);
@@
-145,7
+145,7
@@
xt_tcpmss_target4(struct sk_buff **pskb,
const struct xt_target *target,
const void *targinfo)
{
const struct xt_target *target,
const void *targinfo)
{
- struct iphdr *iph =
(*pskb)->nh.iph
;
+ struct iphdr *iph =
ip_hdr(*pskb)
;
__be16 newlen;
int ret;
__be16 newlen;
int ret;
@@
-154,7
+154,7
@@
xt_tcpmss_target4(struct sk_buff **pskb,
if (ret < 0)
return NF_DROP;
if (ret > 0) {
if (ret < 0)
return NF_DROP;
if (ret > 0) {
- iph =
(*pskb)->nh.iph
;
+ iph =
ip_hdr(*pskb)
;
newlen = htons(ntohs(iph->tot_len) + ret);
nf_csum_replace2(&iph->check, iph->tot_len, newlen);
iph->tot_len = newlen;
newlen = htons(ntohs(iph->tot_len) + ret);
nf_csum_replace2(&iph->check, iph->tot_len, newlen);
iph->tot_len = newlen;
@@
-171,7
+171,7
@@
xt_tcpmss_target6(struct sk_buff **pskb,
const struct xt_target *target,
const void *targinfo)
{
const struct xt_target *target,
const void *targinfo)
{
- struct ipv6hdr *ipv6h =
(*pskb)->nh.ipv6h
;
+ struct ipv6hdr *ipv6h =
ipv6_hdr(*pskb)
;
u8 nexthdr;
int tcphoff;
int ret;
u8 nexthdr;
int tcphoff;
int ret;
@@
-187,7
+187,7
@@
xt_tcpmss_target6(struct sk_buff **pskb,
if (ret < 0)
return NF_DROP;
if (ret > 0) {
if (ret < 0)
return NF_DROP;
if (ret > 0) {
- ipv6h =
(*pskb)->nh.ipv6h
;
+ ipv6h =
ipv6_hdr(*pskb)
;
ipv6h->payload_len = htons(ntohs(ipv6h->payload_len) + ret);
}
return XT_CONTINUE;
ipv6h->payload_len = htons(ntohs(ipv6h->payload_len) + ret);
}
return XT_CONTINUE;