git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[sfrench/cifs-2.6.git]
/
net
/
ipv4
/
netfilter
/
ipt_REJECT.c
diff --git
a/net/ipv4/netfilter/ipt_REJECT.c
b/net/ipv4/netfilter/ipt_REJECT.c
index 0b4b6e0ff2b983985b5b6e3e7a695c6c731d1941..c93ae44bff2a057fcbc089e845369631702ad59d 100644
(file)
--- a/
net/ipv4/netfilter/ipt_REJECT.c
+++ b/
net/ipv4/netfilter/ipt_REJECT.c
@@
-108,17
+108,16
@@
static void send_reset(struct sk_buff *oldskb, int hook)
addr_type = RTN_LOCAL;
/* ip_route_me_harder expects skb->dst to be set */
addr_type = RTN_LOCAL;
/* ip_route_me_harder expects skb->dst to be set */
- dst_hold(oldskb->dst);
- nskb->dst = oldskb->dst;
+ skb_dst_set(nskb, dst_clone(skb_dst(oldskb)));
if (ip_route_me_harder(nskb, addr_type))
goto free_nskb;
if (ip_route_me_harder(nskb, addr_type))
goto free_nskb;
- niph->ttl = dst_metric(
nskb->dst
, RTAX_HOPLIMIT);
+ niph->ttl = dst_metric(
skb_dst(nskb)
, RTAX_HOPLIMIT);
nskb->ip_summed = CHECKSUM_NONE;
/* "Never happens" */
nskb->ip_summed = CHECKSUM_NONE;
/* "Never happens" */
- if (nskb->len > dst_mtu(
nskb->dst
))
+ if (nskb->len > dst_mtu(
skb_dst(nskb)
))
goto free_nskb;
nf_ct_attach(nskb, oldskb);
goto free_nskb;
nf_ct_attach(nskb, oldskb);