Message ID | 1285725095-9860-1-git-send-email-flameeyes@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Diego Elio Pettenò <flameeyes@gmail.com> Date: Wed, 29 Sep 2010 03:51:35 +0200 > + rc = put_user(amount, (int __user *)arg); > + } > + break; Please put the break statement inside of the basic block. The way you have it here the indentation looks not so nice. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Il giorno gio, 30/09/2010 alle 17.35 -0700, David Miller ha scritto: > > > Please put the break statement inside of the basic block. > > The way you have it here the indentation looks not so nice. Okay will resend; please do note that I copied the style (and most of the code) from dccp anyway.
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index ca44917..199ec05 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3595,7 +3595,40 @@ out: /* The SCTP ioctl handler. */ SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg) { - return -ENOIOCTLCMD; + int rc = -ENOTCONN; + + sctp_lock_sock(sk); + + /* + * SEQPACKET-style sockets in LISTENING state are valid, for + * SCTP, so only discard TCP-style sockets in LISTENING state. + */ + if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING)) + goto out; + + switch (cmd) { + case SIOCINQ: { + struct sk_buff *skb; + unsigned int amount = 0; + + skb = skb_peek(&sk->sk_receive_queue); + if (skb != NULL) { + /* + * We will only return the amount of this packet since + * that is all that will be read. + */ + amount = skb->len; + } + rc = put_user(amount, (int __user *)arg); + } + break; + default: + rc = -ENOIOCTLCMD; + break; + } +out: + sctp_release_sock(sk); + return rc; } /* This is the function which gets called during socket creation to