fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 8171c53..190bb3e 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -20,7 +20,6 @@
  *
  * See the GNU General Public License for more details.
  */
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -54,7 +53,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
  *
  *     Return the next unused link number for a given sap.
  */
-static __inline__ u16 llc_ui_next_link_no(int sap)
+static inline u16 llc_ui_next_link_no(int sap)
 {
        return llc_ui_sap_link_no_max[sap]++;
 }
@@ -65,7 +64,7 @@ static __inline__ u16 llc_ui_next_link_no(int sap)
  *
  *     Given an ARP header type return the corresponding ethernet protocol.
  */
-static __inline__ u16 llc_proto_type(u16 arphrd)
+static inline __be16 llc_proto_type(u16 arphrd)
 {
        return arphrd == ARPHRD_IEEE802_TR ?
                         htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
@@ -75,7 +74,7 @@ static __inline__ u16 llc_proto_type(u16 arphrd)
  *     llc_ui_addr_null - determines if a address structure is null
  *     @addr: Address to test if null.
  */
-static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr)
+static inline u8 llc_ui_addr_null(struct sockaddr_llc *addr)
 {
        return !memcmp(addr, &llc_ui_addrnull, sizeof(*addr));
 }
@@ -89,8 +88,7 @@ static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr)
  *     operation the user would like to perform and the type of socket.
  *     Returns the correct llc header length.
  */
-static __inline__ u8 llc_ui_header_len(struct sock *sk,
-                                      struct sockaddr_llc *addr)
+static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)
 {
        u8 rc = LLC_PDU_LEN_U;
 
@@ -138,7 +136,7 @@ static void llc_ui_sk_init(struct socket *sock, struct sock *sk)
 }
 
 static struct proto llc_proto = {
-       .name     = "DDP",
+       .name     = "LLC",
        .owner    = THIS_MODULE,
        .obj_size = sizeof(struct llc_sock),
 };
@@ -188,8 +186,10 @@ static int llc_ui_release(struct socket *sock)
                llc->laddr.lsap, llc->daddr.lsap);
        if (!llc_send_disc(sk))
                llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
-       if (!sock_flag(sk, SOCK_ZAPPED))
+       if (!sock_flag(sk, SOCK_ZAPPED)) {
+               llc_sap_put(llc->sap);
                llc_sap_remove_socket(llc->sap, sk);
+       }
        release_sock(sk);
        if (llc->dev)
                dev_put(llc->dev);
@@ -673,7 +673,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
 
        lock_sock(sk);
        copied = -ENOTCONN;
-       if (sk->sk_state == TCP_LISTEN)
+       if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN))
                goto out;
 
        timeo = sock_rcvtimeo(sk, nonblock);
@@ -732,7 +732,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
                        if (sk->sk_shutdown & RCV_SHUTDOWN)
                                break;
 
-                       if (sk->sk_state == TCP_CLOSE) {
+                       if (sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_CLOSE) {
                                if (!sock_flag(sk, SOCK_DONE)) {
                                        /*
                                         * This occurs when user tries to read
@@ -784,24 +784,20 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
                copied += used;
                len -= used;
 
-               if (used + offset < skb->len)
-                       continue;
-
                if (!(flags & MSG_PEEK)) {
-                       sk_eat_skb(sk, skb);
+                       sk_eat_skb(sk, skb, 0);
                        *seq = 0;
                }
+
+               /* For non stream protcols we get one packet per recvmsg call */
+               if (sk->sk_type != SOCK_STREAM)
+                       goto copy_uaddr;
+
+               /* Partial read */
+               if (used + offset < skb->len)
+                       continue;
        } while (len > 0);
 
-       /* 
-        * According to UNIX98, msg_name/msg_namelen are ignored
-        * on connected socket. -ANK
-        * But... af_llc still doesn't have separate sets of methods for
-        * SOCK_DGRAM and SOCK_STREAM :-( So we have to do this test, will
-        * eventually fix this tho :-) -acme
-        */
-       if (sk->sk_type == SOCK_DGRAM)
-               goto copy_uaddr;
 out:
        release_sock(sk);
        return copied;