From patchwork Sun Apr 1 17:49:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eldad Zack X-Patchwork-Id: 149973 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 21E00B6EEF for ; Mon, 2 Apr 2012 03:52:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753220Ab2DARu1 (ORCPT ); Sun, 1 Apr 2012 13:50:27 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:49388 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753115Ab2DARtk (ORCPT ); Sun, 1 Apr 2012 13:49:40 -0400 Received: by mail-ey0-f174.google.com with SMTP id q12so619984eaa.19 for ; Sun, 01 Apr 2012 10:49:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=65R8WijCWNE+ccKOKsTFWLi2Zso1+uHaU3A/nbEH4wM=; b=Yfu8UDJkjFsRgHDjQRGMctMlEbLcKJUV366Ho1iEVSCU75eJHmXKjhdwe/2QlcC7IF Oqs0u1emS4bw6KShreE9DeTgDD7W2/bjypHCXaFmZDmeq7RAqafE65VVYmsvqG7haCx9 1cNwq7c2um+oShDMM1DHF+ccj8ecj8GfEVKitONnTwPEalcXAJdCl+I6SYXO53ZsEGFq CD5ohIFaMDPc6pIAAj9CSIxipKA1APSiryqIs8u5kj28Q5HT8cgN3/IpwSvvV2pUdP7h ZYXvM3lDaNnyPx1FcAw3dMudW3favrnlFAownSPqUD0Q+T+UNuRhCBNK5oVo5b0I+TPN 2jhw== Received: by 10.213.28.66 with SMTP id l2mr339552ebc.8.1333302579742; Sun, 01 Apr 2012 10:49:39 -0700 (PDT) Received: from localhost ([2001:470:8876:3c58:b602:d7f0:578a:55ee]) by mx.google.com with ESMTPS id r44sm54441002eef.2.2012.04.01.10.49.37 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Apr 2012 10:49:39 -0700 (PDT) From: Eldad Zack To: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Eldad Zack Subject: [PATCH 3/8] net/ipv6/datagram.c: Checkpatch cleanups Date: Sun, 1 Apr 2012 19:49:03 +0200 Message-Id: <1333302548-9187-3-git-send-email-eldad@fogrefinery.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1333302548-9187-1-git-send-email-eldad@fogrefinery.com> References: <1333302548-9187-1-git-send-email-eldad@fogrefinery.com> X-Gm-Message-State: ALoCoQkCg2IYdt02/JKul+cZ/a3x6DiT4p68Eh6TA2ai7MyR5rU1Hjk994pk8gE7hTC9nm7liJOg Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org datagram.c:101: ERROR: "(foo*)" should be "(foo *)" datagram.c:521: ERROR: space required before the open parenthesis '(' datagram.c:830: WARNING: braces {} are not necessary for single statement blocks datagram.c:849: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Eldad Zack --- net/ipv6/datagram.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 76832c8..f6210d6 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -98,7 +98,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) sin.sin_port = usin->sin6_port; err = ip4_datagram_connect(sk, - (struct sockaddr*) &sin, + (struct sockaddr *) &sin, sizeof(sin)); ipv4_connected: @@ -518,7 +518,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) unsigned len; u8 *ptr = nh + off; - switch(nexthdr) { + switch (nexthdr) { case IPPROTO_DSTOPTS: nexthdr = ptr[0]; len = (ptr[1] + 1) << 3; @@ -827,9 +827,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk, int tc; err = -EINVAL; - if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { + if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) goto exit_f; - } tc = *(int *)CMSG_DATA(cmsg); if (tc < -1 || tc > 0xff) @@ -846,9 +845,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk, int df; err = -EINVAL; - if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { + if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) goto exit_f; - } df = *(int *)CMSG_DATA(cmsg); if (df < 0 || df > 1)