diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index dc593bd4fcbf..568fd19bad0c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -111,18 +111,6 @@ config IP_NF_TARGET_REJECT To compile it as a module, choose M here. If unsure, say N. -config IP_NF_TARGET_REJECT_SKERR - bool "Force socket error when rejecting with icmp*" - depends on IP_NF_TARGET_REJECT - default n - help - This option enables turning a "--reject-with icmp*" into a matching - socket error also. - The REJECT target normally allows sending an ICMP message. But it - leaves the local socket unaware of any ingress rejects. - - If unsure, say N. - config IP_NF_TARGET_ULOG tristate "ULOG target support" default m if NETFILTER_ADVANCED=n diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c index 452e8a587c34..04b18c1ac345 100644 --- a/net/ipv4/netfilter/ipt_REJECT.c +++ b/net/ipv4/netfilter/ipt_REJECT.c @@ -129,14 +129,6 @@ static void send_reset(struct sk_buff *oldskb, int hook) static inline void send_unreach(struct sk_buff *skb_in, int code) { icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0); -#ifdef CONFIG_IP_NF_TARGET_REJECT_SKERR - if (skb_in->sk) { - skb_in->sk->sk_err = icmp_err_convert[code].errno; - skb_in->sk->sk_error_report(skb_in->sk); - pr_debug("ipt_REJECT: sk_err=%d for skb=%p sk=%p\n", - skb_in->sk->sk_err, skb_in, skb_in->sk); - } -#endif } static unsigned int diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 9488916d1f2b..8d03367ba843 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -154,18 +154,6 @@ config IP6_NF_TARGET_REJECT To compile it as a module, choose M here. If unsure, say N. -config IP6_NF_TARGET_REJECT_SKERR - bool "Force socket error when rejecting with icmp*" - depends on IP6_NF_TARGET_REJECT - default n - help - This option enables turning a "--reject-with icmp*" into a matching - socket error also. - The REJECT target normally allows sending an ICMP message. But it - leaves the local socket unaware of any ingress rejects. - - If unsure, say N. - config IP6_NF_MANGLE tristate "Packet mangling" default m if NETFILTER_ADVANCED=n diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index 573c232239b0..70f9abc0efe9 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c @@ -180,15 +180,6 @@ send_unreach(struct net *net, struct sk_buff *skb_in, unsigned char code, skb_in->dev = net->loopback_dev; icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0); -#ifdef CONFIG_IP6_NF_TARGET_REJECT_SKERR - if (skb_in->sk) { - icmpv6_err_convert(ICMPV6_DEST_UNREACH, code, - &skb_in->sk->sk_err); - skb_in->sk->sk_error_report(skb_in->sk); - pr_debug("ip6t_REJECT: sk_err=%d for skb=%p sk=%p\n", - skb_in->sk->sk_err, skb_in, skb_in->sk); - } -#endif } static unsigned int