Re: [PATCH 2/2] [AF_IUCV/IUCV] : Add missing section annotations

2007-05-05 Thread Heiko Carstens
On Fri, May 04, 2007 at 12:24:19PM -0700, David Miller wrote:
> From: Frank Pavlic <[EMAIL PROTECTED]>
> Date: Fri, 4 May 2007 11:52:38 +0200
> 
> > From: Heiko Carstens <[EMAIL PROTECTED]>
> > 
> > Add missing section annotations and found and fixed some
> > Coding Style issues.
> > 
> > Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
> > Signed-off-by: Frank Pavlic <[EMAIL PROTECTED]>
> 
> Applied, although I find it amusing that the changelog
> header talks about section annotations (plural!) but
> that is one line of the patch, whereas %99 of the patch
> is coding style cleanups.

Actually it contained the breathtaking number of 3 section
annotations, so that only 95% of the patch is coding style
cleanups ;)
Apparantly Frank merged two patches and took the one line
patch description of the first one.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 2/2] [AF_IUCV/IUCV] : Add missing section annotations

2007-05-04 Thread David Miller
From: Frank Pavlic <[EMAIL PROTECTED]>
Date: Fri, 4 May 2007 11:52:38 +0200

> From: Heiko Carstens <[EMAIL PROTECTED]>
> 
> Add missing section annotations and found and fixed some
> Coding Style issues.
> 
> Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
> Signed-off-by: Frank Pavlic <[EMAIL PROTECTED]>

Applied, although I find it amusing that the changelog
header talks about section annotations (plural!) but
that is one line of the patch, whereas %99 of the patch
is coding style cleanups.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/2] [AF_IUCV/IUCV] : Add missing section annotations

2007-05-04 Thread Frank Pavlic
From: Heiko Carstens <[EMAIL PROTECTED]>

Add missing section annotations and found and fixed some
Coding Style issues.

Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
Signed-off-by: Frank Pavlic <[EMAIL PROTECTED]>
---
 af_iucv.c |   44 +++-
 iucv.c|   49 ++---
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 026704a..2f13738 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -45,7 +45,8 @@ static struct proto iucv_proto = {
 static void iucv_callback_rx(struct iucv_path *, struct iucv_message *);
 static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *);
 static void iucv_callback_connack(struct iucv_path *, u8 ipuser[16]);
-static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8], u8 
ipuser[16]);
+static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8],
+u8 ipuser[16]);
 static void iucv_callback_connrej(struct iucv_path *, u8 ipuser[16]);
 
 static struct iucv_sock_list iucv_sk_list = {
@@ -152,7 +153,7 @@ static void iucv_sock_close(struct sock *sk)
iucv_sock_clear_timer(sk);
lock_sock(sk);
 
-   switch(sk->sk_state) {
+   switch (sk->sk_state) {
case IUCV_LISTEN:
iucv_sock_cleanup_listen(sk);
break;
@@ -164,7 +165,7 @@ static void iucv_sock_close(struct sock *sk)
sk->sk_state = IUCV_CLOSING;
sk->sk_state_change(sk);
 
-   if(!skb_queue_empty(&iucv->send_skb_q)) {
+   if (!skb_queue_empty(&iucv->send_skb_q)) {
if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
timeo = sk->sk_lingertime;
else
@@ -292,7 +293,7 @@ struct sock *iucv_accept_dequeue(struct sock *parent, 
struct socket *newsock)
struct iucv_sock *isk, *n;
struct sock *sk;
 
-   list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q){
+   list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
sk = (struct sock *) isk;
lock_sock(sk);
 
@@ -537,7 +538,7 @@ static int iucv_sock_accept(struct socket *sock, struct 
socket *newsock,
 
/* Wait for an incoming connection */
add_wait_queue_exclusive(sk->sk_sleep, &wait);
-   while (!(nsk = iucv_accept_dequeue(sk, newsock))){
+   while (!(nsk = iucv_accept_dequeue(sk, newsock))) {
set_current_state(TASK_INTERRUPTIBLE);
if (!timeo) {
err = -EAGAIN;
@@ -618,13 +619,13 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct 
socket *sock,
goto out;
}
 
-   if (sk->sk_state == IUCV_CONNECTED){
-   if(!(skb = sock_alloc_send_skb(sk, len,
-  msg->msg_flags & MSG_DONTWAIT,
-  &err)))
+   if (sk->sk_state == IUCV_CONNECTED) {
+   if (!(skb = sock_alloc_send_skb(sk, len,
+   msg->msg_flags & MSG_DONTWAIT,
+   &err)))
goto out;
 
-   if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)){
+   if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
err = -EFAULT;
goto fail;
}
@@ -710,7 +711,7 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct 
socket *sock,
 
/* Queue backlog skbs */
rskb = skb_dequeue(&iucv_sk(sk)->backlog_skb_q);
-   while(rskb) {
+   while (rskb) {
if (sock_queue_rcv_skb(sk, rskb)) {
skb_queue_head(&iucv_sk(sk)->backlog_skb_q,
rskb);
@@ -731,7 +732,7 @@ static inline unsigned int iucv_accept_poll(struct sock 
*parent)
struct iucv_sock *isk, *n;
struct sock *sk;
 
-   list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q){
+   list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
sk = (struct sock *) isk;
 
if (sk->sk_state == IUCV_CONNECTED)
@@ -762,7 +763,7 @@ unsigned int iucv_sock_poll(struct file *file, struct 
socket *sock,
mask |= POLLHUP;
 
if (!skb_queue_empty(&sk->sk_receive_queue) ||
-   (sk->sk_shutdown & RCV_SHUTDOWN))
+   (sk->sk_shutdown & RCV_SHUTDOWN))
mask |= POLLIN | POLLRDNORM;
 
if (sk->sk_state == IUCV_CLOSED)
@@ -793,7 +794,7 @@ static int iucv_sock_shutdown(struct socket *sock, int how)
return -EINVAL;
 
lock_sock(sk);
-   switch(sk->sk_state) {
+   switch (sk->sk_state) {
c