From patchwork Fri Oct 11 16:03:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 282826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 412312C00C8 for ; Sat, 12 Oct 2013 03:03:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758383Ab3JKQD2 (ORCPT ); Fri, 11 Oct 2013 12:03:28 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:64990 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754457Ab3JKQD1 (ORCPT ); Fri, 11 Oct 2013 12:03:27 -0400 Received: by mail-pb0-f48.google.com with SMTP id ma3so4407238pbc.21 for ; Fri, 11 Oct 2013 09:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type :content-transfer-encoding:mime-version; bh=a9kqNZMJZF47XGaURssZoVn7HQOVfU4yzWinn8WZquE=; b=rpvG9Sf7Z22iP0rSws/baAOVcWoTsO+7/ap3N/ecAImqqECB7iCfN3M2Y3mm4zmhQ2 SKjKpt0kIvPnsTZ8hIHywUx/wVK4PnVF2P9Xa0X3q4xjfEuFjq3wDMw+pBMQYy2D5gAQ KMPv3NKytkoLSba89zL5eD5fE+DJi+3y33Y204fGY1CR+lX71pSvK6kAqukyxeZ2Ksv6 y9OXSfQfJyAbg2OULNF7sJwQsSBifLEXSWNDafYf+pYOkSbY0/LGJSZlQMGB28FlQjer Qsnv0nPKZOkpr39camknWFTKjD2QygVfsdCT2CcDeX36DiopqFkr2TfvAVHJOtmDHWLc 55+w== X-Received: by 10.66.170.138 with SMTP id am10mr22050663pac.51.1381507407098; Fri, 11 Oct 2013 09:03:27 -0700 (PDT) Received: from [172.26.49.220] ([172.26.49.220]) by mx.google.com with ESMTPSA id y5sm60741243pbs.18.1969.12.31.16.00.00 (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 09:03:26 -0700 (PDT) Message-ID: <1381507405.4971.108.camel@edumazet-glaptop.roam.corp.google.com> Subject: [PATCH net-next] netfilter: xt_socket: use sock_gen_put() From: Eric Dumazet To: David Miller Cc: netdev , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Date: Fri, 11 Oct 2013 09:03:25 -0700 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Eric Dumazet TCP listener refactoring, part 7 : Use sock_gen_put() instead of xt_socket_put_sk() for future SYN_RECV support. Signed-off-by: Eric Dumazet Cc: Pablo Neira Ayuso --- net/netfilter/xt_socket.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 3dd0e37..1ba6793 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -35,15 +35,6 @@ #include #endif -static void -xt_socket_put_sk(struct sock *sk) -{ - if (sk->sk_state == TCP_TIME_WAIT) - inet_twsk_put(inet_twsk(sk)); - else - sock_put(sk); -} - static int extract_icmp4_fields(const struct sk_buff *skb, u8 *protocol, @@ -216,7 +207,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, inet_twsk(sk)->tw_transparent)); if (sk != skb->sk) - xt_socket_put_sk(sk); + sock_gen_put(sk); if (wildcard || !transparent) sk = NULL; @@ -381,7 +372,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par) inet_twsk(sk)->tw_transparent)); if (sk != skb->sk) - xt_socket_put_sk(sk); + sock_gen_put(sk); if (wildcard || !transparent) sk = NULL;