diff options
| author |   Steve French <sfrench@us.ibm.com> | 2009-01-12 21:03:25 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-01-29 03:32:12 +0000 |
| commit | 6a7f8d36c00ab7adef5fb633f7805c91e8c1e139 (patch) | |
| tree | 9580a3e4fa4ec4f70a5f2a68b2a3d7ab52592ae8 /fs/cifs/md5.h | |
| parent | cifs: turn smb_send into a wrapper around smb_sendv (diff) | |
| download | linux-dev-6a7f8d36c00ab7adef5fb633f7805c91e8c1e139.tar.xz linux-dev-6a7f8d36c00ab7adef5fb633f7805c91e8c1e139.zip | |
[CIFS] Rename md5 functions to avoid collision with new rt modules
When rt modules were added they (each) included their own md5
with names which collided with the existing names of cifs's md5 functions.
Renaming cifs's md5 modules so we don't collide with them.
> Stephen Rothwell wrote:
> When CIFS is built-in (=y) and staging/rt28[67]0 =y, there are multiple
> definitions of:
>
> build-r8250.out:(.text+0x1d8ad0): multiple definition of `MD5Init'
> build-r8250.out:(.text+0x1dbb30): multiple definition of `MD5Update'
> build-r8250.out:(.text+0x1db9b0): multiple definition of `MD5Final'
>
> all of which need to have more unique identifiers for their global
> symbols (e.g., rt28_md5_init, cifs_md5_init, foo, blah, bar).
>
CC: Greg K-H <gregkh@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/md5.h')
| -rw-r--r-- | fs/cifs/md5.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/md5.h b/fs/cifs/md5.h index f7d4f4197bac..6fba8cb402fd 100644 --- a/fs/cifs/md5.h +++ b/fs/cifs/md5.h @@ -20,10 +20,10 @@ struct HMACMD5Context { }; #endif /* _HMAC_MD5_H */ -void MD5Init(struct MD5Context *context); -void MD5Update(struct MD5Context *context, unsigned char const *buf, +void cifs_MD5_init(struct MD5Context *context); +void cifs_MD5_update(struct MD5Context *context, unsigned char const *buf, unsigned len); -void MD5Final(unsigned char digest[16], struct MD5Context *context); +void cifs_MD5_final(unsigned char digest[16], struct MD5Context *context); /* The following definitions come from lib/hmacmd5.c */ |