netdev
[Top] [All Lists]

[PATCH/RFC] Remove spurious sk_filter() call from IPv6

To: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>
Subject: [PATCH/RFC] Remove spurious sk_filter() call from IPv6
From: James Morris <jmorris@xxxxxxxxx>
Date: Tue, 25 Oct 2005 12:48:14 -0400 (EDT)
Cc: netdev@xxxxxxxxxxx
Sender: netdev-bounce@xxxxxxxxxxx
It seems that the IPv6 input path has an extra call to sk_filter().

First, the correct call to sk_filter() in tcp_v6_rcv(), matching the IPv4 
code.

Then, again in tcp_v6_do_rcv(), which often results in a somewhat already 
processed skb being passed to sk_filter().

As far as I can tell, we should remove this second call, as it is both 
incorrect and uncecessary.

Please review and apply if ok.

Signed-off-by: James Morris <jmorris@xxxxxxxxx>


---

 net/ipv6/tcp_ipv6.c |    3 ---
 1 files changed, 3 deletions(-)

diff -purN -X dontdiff linux-2.6.14-rc5.o/net/ipv6/tcp_ipv6.c 
linux-2.6.14-rc5.ipv6/net/ipv6/tcp_ipv6.c
--- linux-2.6.14-rc5.o/net/ipv6/tcp_ipv6.c      2005-10-21 00:43:33.000000000 
-0400
+++ linux-2.6.14-rc5.ipv6/net/ipv6/tcp_ipv6.c   2005-10-25 12:44:23.000000000 
-0400
@@ -1451,9 +1451,6 @@ static int tcp_v6_do_rcv(struct sock *sk
        if (skb->protocol == htons(ETH_P_IP))
                return tcp_v4_do_rcv(sk, skb);
 
-       if (sk_filter(sk, skb, 0))
-               goto discard;
-
        /*
         *      socket locking is here for SMP purposes as backlog rcv
         *      is currently called with bh processing disabled.

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH/RFC] Remove spurious sk_filter() call from IPv6, James Morris <=