include/linux/unaligned/{l,b}e_byteshift.h: fix usage for compressed kernels

[safe/jmp/linux-2.6] / include / linux / ncp_fs_sb.h

diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index cf858eb..6330fc7 100644 (file)
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
 #include <linux/net.h>
+#include <linux/mutex.h>
 
 #ifdef __KERNEL__
 
@@ -49,9 +50,11 @@ struct ncp_server {
        int packet_size;
        unsigned char *packet;  /* Here we prepare requests and
                                   receive replies */
+       unsigned char *txbuf;   /* Storage for current request */
+       unsigned char *rxbuf;   /* Storage for reply to current request */
 
        int lock;               /* To prevent mismatch in protocols. */
-       struct semaphore sem;
+       struct mutex mutex;
 
        int current_size;       /* for packet preparation */
        int has_subfunction;
@@ -96,7 +99,7 @@ struct ncp_server {
        struct {
                struct work_struct tq;          /* STREAM/DGRAM: data/error ready */
                struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */
-               struct semaphore creq_sem;      /* DGRAM only: lock accesses to rcv.creq */
+               struct mutex creq_mutex;        /* DGRAM only: lock accesses to rcv.creq */
 
                unsigned int state;             /* STREAM only: receiver state */
                struct {
@@ -126,10 +129,10 @@ struct ncp_server {
        } unexpected_packet;
 };
 
-extern void ncp_tcp_rcv_proc(void *server);
-extern void ncp_tcp_tx_proc(void *server);
-extern void ncpdgram_rcv_proc(void *server);
-extern void ncpdgram_timeout_proc(void *server);
+extern void ncp_tcp_rcv_proc(struct work_struct *work);
+extern void ncp_tcp_tx_proc(struct work_struct *work);
+extern void ncpdgram_rcv_proc(struct work_struct *work);
+extern void ncpdgram_timeout_proc(struct work_struct *work);
 extern void ncpdgram_timeout_call(unsigned long server);
 extern void ncp_tcp_data_ready(struct sock* sk, int len);
 extern void ncp_tcp_write_space(struct sock* sk);