diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-04 06:21:02 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-04 06:21:02 -0800 |
commit | a802f50d6e92298d44a806d326a2ba3eefa6db72 (patch) | |
tree | 40cafff98f5248d0121656fc538e65dc9baa64b2 /fs/smb/client/smbencrypt.c | |
parent | fccc9d9233f918ee50cf2955ae7134a7f3418351 (diff) | |
parent | 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 (diff) | |
download | linux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.gz linux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.bz2 linux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.zip |
Merge 6.8-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/smb/client/smbencrypt.c')
-rw-r--r-- | fs/smb/client/smbencrypt.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/smb/client/smbencrypt.c b/fs/smb/client/smbencrypt.c index f0ce26414f17..1d1ee9f18f37 100644 --- a/fs/smb/client/smbencrypt.c +++ b/fs/smb/client/smbencrypt.c @@ -26,13 +26,6 @@ #include "cifsproto.h" #include "../common/md4.h" -#ifndef false -#define false 0 -#endif -#ifndef true -#define true 1 -#endif - /* following came from the other byteorder.h to avoid include conflicts */ #define CVAL(buf,pos) (((unsigned char *)(buf))[pos]) #define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8) |