projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
cifs
/
smb2misc.c
diff --git
a/fs/cifs/smb2misc.c
b/fs/cifs/smb2misc.c
index 689f035915cf70f075d71fca5e281ec009c5420a..22dfdf17d06547f3d1b3abbc302bb03abf1b047b 100644
(file)
--- a/
fs/cifs/smb2misc.c
+++ b/
fs/cifs/smb2misc.c
@@
-322,7
+322,7
@@
smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
/* return pointer to beginning of data area, ie offset from SMB start */
if ((*off != 0) && (*len != 0))
- return
hdr->ProtocolId
+ *off;
+ return
(char *)(&hdr->ProtocolId[0])
+ *off;
else
return NULL;
}