diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-10 17:45:50 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-10 17:45:50 -0400 |
| commit | 976a6f921cad26651d25e73826c05c7a023f5fa4 (patch) | |
| tree | b06e283e3fe342bcf444328390b211bb155fd9dc /include/linux/sunrpc/msg_prot.h | |
| parent | e576e05a73bc1a00cdf56630942dbada1bf280a1 (diff) | |
| parent | c05988cdb06237738d361ef82fbf4df1020aa3db (diff) | |
| download | lwn-976a6f921cad26651d25e73826c05c7a023f5fa4.tar.gz lwn-976a6f921cad26651d25e73826c05c7a023f5fa4.zip | |
Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32
Diffstat (limited to 'include/linux/sunrpc/msg_prot.h')
| -rw-r--r-- | include/linux/sunrpc/msg_prot.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h index 70df4f1d8847..77e624883393 100644 --- a/include/linux/sunrpc/msg_prot.h +++ b/include/linux/sunrpc/msg_prot.h @@ -189,7 +189,22 @@ typedef __be32 rpc_fraghdr; * Additionally, the two alternative forms specified in Section 2.2 of * [RFC2373] are also acceptable. */ -#define RPCBIND_MAXUADDRLEN (56u) + +#include <linux/inet.h> + +/* Maximum size of the port number part of a universal address */ +#define RPCBIND_MAXUADDRPLEN sizeof(".255.255") + +/* Maximum size of an IPv4 universal address */ +#define RPCBIND_MAXUADDR4LEN \ + (INET_ADDRSTRLEN + RPCBIND_MAXUADDRPLEN) + +/* Maximum size of an IPv6 universal address */ +#define RPCBIND_MAXUADDR6LEN \ + (INET6_ADDRSTRLEN + RPCBIND_MAXUADDRPLEN) + +/* Assume INET6_ADDRSTRLEN will always be larger than INET_ADDRSTRLEN... */ +#define RPCBIND_MAXUADDRLEN RPCBIND_MAXUADDR6LEN #endif /* __KERNEL__ */ #endif /* _LINUX_SUNRPC_MSGPROT_H_ */ |