projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv4: Merge ip_local_out and ip_local_out_sk
[deliverable/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_reject_ipv4.c
diff --git
a/net/ipv4/netfilter/nf_reject_ipv4.c
b/net/ipv4/netfilter/nf_reject_ipv4.c
index 3262e41ff76f38a89db3fd7da8c771a51b273abf..dcc125cb0441eb50940dbd2ddffea29f2b93ab2b 100644
(file)
--- a/
net/ipv4/netfilter/nf_reject_ipv4.c
+++ b/
net/ipv4/netfilter/nf_reject_ipv4.c
@@
-99,7
+99,7
@@
void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,
EXPORT_SYMBOL_GPL(nf_reject_ip_tcphdr_put);
/* Send RST reply */
EXPORT_SYMBOL_GPL(nf_reject_ip_tcphdr_put);
/* Send RST reply */
-void nf_send_reset(struct sk_buff *oldskb, int hook)
+void nf_send_reset(struct
net *net, struct
sk_buff *oldskb, int hook)
{
struct sk_buff *nskb;
const struct iphdr *oiph;
{
struct sk_buff *nskb;
const struct iphdr *oiph;
@@
-129,7
+129,7
@@
void nf_send_reset(struct sk_buff *oldskb, int hook)
ip4_dst_hoplimit(skb_dst(nskb)));
nf_reject_ip_tcphdr_put(nskb, oldskb, oth);
ip4_dst_hoplimit(skb_dst(nskb)));
nf_reject_ip_tcphdr_put(nskb, oldskb, oth);
- if (ip_route_me_harder(nskb, RTN_UNSPEC))
+ if (ip_route_me_harder(n
et, n
skb, RTN_UNSPEC))
goto free_nskb;
/* "Never happens" */
goto free_nskb;
/* "Never happens" */
@@
-157,7
+157,7
@@
void nf_send_reset(struct sk_buff *oldskb, int hook)
dev_queue_xmit(nskb);
} else
#endif
dev_queue_xmit(nskb);
} else
#endif
- ip_local_out(nskb);
+ ip_local_out(nskb
->sk, nskb
);
return;
return;
This page took
0.025927 seconds
and
5
git commands to generate.