From patchwork Mon Feb 2 06:19:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 21542 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5B6F6DDF5A for ; Mon, 2 Feb 2009 17:19:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752104AbZBBGTW (ORCPT ); Mon, 2 Feb 2009 01:19:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751800AbZBBGTW (ORCPT ); Mon, 2 Feb 2009 01:19:22 -0500 Received: from rhun.apana.org.au ([64.62.148.172]:40029 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751449AbZBBGTW (ORCPT ); Mon, 2 Feb 2009 01:19:22 -0500 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1LTs9P-00082i-Ru; Mon, 02 Feb 2009 17:19:20 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1LTs9O-0006FG-NW; Mon, 02 Feb 2009 17:19:18 +1100 Date: Mon, 2 Feb 2009 17:19:18 +1100 From: Herbert Xu To: "David S. Miller" , netdev@vger.kernel.org Subject: ipv4: Delete redundant sk_family assignment Message-ID: <20090202061918.GA23990@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Dave: Here's a random clean-up that I did while working on tun accounting. ipv4: Delete redundant sk_family assignment sk_alloc now sets sk_family so this is redundant. In fact it caught my eye because sock_init_data already uses sk_family so this is too late anyway. Signed-off-by: Herbert Xu Cheers, diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index d6770f2..7b3ca13 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -369,7 +369,6 @@ lookup_protocol: sock_init_data(sock, sk); sk->sk_destruct = inet_sock_destruct; - sk->sk_family = PF_INET; sk->sk_protocol = protocol; sk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;