Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6] / include / net / 9p / 9p.h

diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 7726ff41c3e68722026bd91469fe2148c633c1e2..686425a97b0f63b1be45a6b59aa2a3c5c044068c 100644 (file)
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -216,6 +216,7 @@ struct p9_tauth {
        u32 afid;
        struct p9_str uname;
        struct p9_str aname;
+       u32 n_uname;            /* 9P2000.u extensions */
 };
 
 struct p9_rauth {
@@ -239,6 +240,7 @@ struct p9_tattach {
        u32 afid;
        struct p9_str uname;
        struct p9_str aname;
+       u32 n_uname;            /* 9P2000.u extensions */
 };
 
 struct p9_rattach {
@@ -382,8 +384,9 @@ int p9_deserialize_fcall(void *buf, u32 buflen, struct p9_fcall *fc, int dotu);
 void p9_set_tag(struct p9_fcall *fc, u16 tag);
 struct p9_fcall *p9_create_tversion(u32 msize, char *version);
 struct p9_fcall *p9_create_tattach(u32 fid, u32 afid, char *uname,
-       char *aname);
-struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname);
+       char *aname, u32 n_uname, int dotu);
+struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname,
+       u32 n_uname, int dotu);
 struct p9_fcall *p9_create_tflush(u16 oldtag);
 struct p9_fcall *p9_create_twalk(u32 fid, u32 newfid, u16 nwname,
        char **wnames);
@@ -412,18 +415,4 @@ int p9_idpool_check(int id, struct p9_idpool *p);
 
 int p9_error_init(void);
 int p9_errstr2errno(char *, int);
-
-#ifdef CONFIG_SYSCTL
-int __init p9_sysctl_register(void);
-void __exit p9_sysctl_unregister(void);
-#else
-static inline int p9_sysctl_register(void)
-{
-       return 0;
-}
-static inline void p9_sysctl_unregister(void)
-{
-}
-#endif
-
 #endif /* NET_9P_H */