diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-29 20:49:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-29 20:49:13 -0700 |
| commit | d31e3792919e5c97d572c8a27a5a7c1eb9de5aca (patch) | |
| tree | d29747eac48117102d497d2783d326aaca7526ab /include/linux | |
| parent | b88e123cc0b53e32b0a20700e4815a28895e6b47 (diff) | |
| parent | a171eb5cac427fa8d084eaf5e47fbe4c0f1e279f (diff) | |
Merge tag '6.5-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fixes from Steve French:
"Four small SMB3 client fixes:
- two reconnect fixes (to address the case where non-default
iocharset gets incorrectly overridden at reconnect with the
default charset)
- fix for NTLMSSP_AUTH request setting a flag incorrectly)
- Add missing check for invalid tlink (tree connection) in ioctl"
* tag '6.5-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: add missing return value check for cifs_sb_tlink
smb3: do not set NTLMSSP_VERSION flag for negotiate not auth request
cifs: fix charset issue in reconnection
fs/nls: make load_nls() take a const parameter
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nls.h b/include/linux/nls.h index 499e486b3722..e0bf8367b274 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h @@ -47,7 +47,7 @@ enum utf16_endian { /* nls_base.c */ extern int __register_nls(struct nls_table *, struct module *); extern int unregister_nls(struct nls_table *); -extern struct nls_table *load_nls(char *); +extern struct nls_table *load_nls(const char *charset); extern void unload_nls(struct nls_table *); extern struct nls_table *load_nls_default(void); #define register_nls(nls) __register_nls((nls), THIS_MODULE) |