diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-21 02:19:30 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-21 02:19:30 +0000 |
| commit | bf67b9be97baea84386abca38b2503bb286571dc (patch) | |
| tree | 576c32ee13dfec1a95d5a50cb2dc0aefbb72f49a /fs/cifs/netmisc.c | |
| parent | 8d99641f6c1af806cd5d9e6badce91910219a161 (diff) | |
| parent | 84cdf74e8096a10dd6acbb870dd404b92f07a756 (diff) | |
Merge branch 'for-next'
Diffstat (limited to 'fs/cifs/netmisc.c')
| -rw-r--r-- | fs/cifs/netmisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 6783ce6cdc8..8d9189f6447 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -916,14 +916,14 @@ unsigned int smbCalcSize(struct smb_hdr *ptr) { return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) + - 2 /* size of the bcc field */ + BCC(ptr)); + 2 /* size of the bcc field */ + get_bcc(ptr)); } unsigned int smbCalcSize_LE(struct smb_hdr *ptr) { return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) + - 2 /* size of the bcc field */ + le16_to_cpu(BCC_LE(ptr))); + 2 /* size of the bcc field */ + get_bcc_le(ptr)); } /* The following are taken from fs/ntfs/util.c */ |