aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2012-04-01 03:49:03 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-02 04:33:45 -0400
commitb5a4257cef5e8d6efb2ac9322b00377279ffd234 (patch)
tree6c57029d7f443e4fe0f54687be3d193e18619a9f /net
parentd94d34a0664b296fd1593a96ccc9c97a94dfd43d (diff)
net/ipv6/datagram.c: Checkpatch cleanups
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 <eldad@fogrefinery.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/datagram.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 76832c8dc89d..f6210d6fd7d8 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)
98 sin.sin_port = usin->sin6_port; 98 sin.sin_port = usin->sin6_port;
99 99
100 err = ip4_datagram_connect(sk, 100 err = ip4_datagram_connect(sk,
101 (struct sockaddr*) &sin, 101 (struct sockaddr *) &sin,
102 sizeof(sin)); 102 sizeof(sin));
103 103
104ipv4_connected: 104ipv4_connected:
@@ -518,7 +518,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
518 unsigned len; 518 unsigned len;
519 u8 *ptr = nh + off; 519 u8 *ptr = nh + off;
520 520
521 switch(nexthdr) { 521 switch (nexthdr) {
522 case IPPROTO_DSTOPTS: 522 case IPPROTO_DSTOPTS:
523 nexthdr = ptr[0]; 523 nexthdr = ptr[0];
524 len = (ptr[1] + 1) << 3; 524 len = (ptr[1] + 1) << 3;
@@ -827,9 +827,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
827 int tc; 827 int tc;
828 828
829 err = -EINVAL; 829 err = -EINVAL;
830 if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { 830 if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
831 goto exit_f; 831 goto exit_f;
832 }
833 832
834 tc = *(int *)CMSG_DATA(cmsg); 833 tc = *(int *)CMSG_DATA(cmsg);
835 if (tc < -1 || tc > 0xff) 834 if (tc < -1 || tc > 0xff)
@@ -846,9 +845,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
846 int df; 845 int df;
847 846
848 err = -EINVAL; 847 err = -EINVAL;
849 if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { 848 if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
850 goto exit_f; 849 goto exit_f;
851 }
852 850
853 df = *(int *)CMSG_DATA(cmsg); 851 df = *(int *)CMSG_DATA(cmsg);
854 if (df < 0 || df > 1) 852 if (df < 0 || df > 1)