diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-11 15:38:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-11 15:38:23 -0400 |
| commit | e79aa8671033535c2e9ffc0a68010ae49ed5734c (patch) | |
| tree | 237e16dd5d999f6ac2de89ae2a1d35ae0d4d74fd /drivers/net/wimax/i2400m | |
| parent | 349124a00754129a5f1e43efa84733e364bf3749 (diff) | |
| parent | a385a53e659b35ebee604889e21c40e5c336941f (diff) | |
Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax/i2400m')
| -rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 3f283bff0ff7..11491354e5b5 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c | |||
| @@ -1192,7 +1192,7 @@ int i2400m_fw_hdr_check(struct i2400m *i2400m, | |||
| 1192 | unsigned module_type, header_len, major_version, minor_version, | 1192 | unsigned module_type, header_len, major_version, minor_version, |
| 1193 | module_id, module_vendor, date, size; | 1193 | module_id, module_vendor, date, size; |
| 1194 | 1194 | ||
| 1195 | module_type = bcf_hdr->module_type; | 1195 | module_type = le32_to_cpu(bcf_hdr->module_type); |
| 1196 | header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len); | 1196 | header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len); |
| 1197 | major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000) | 1197 | major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000) |
| 1198 | >> 16; | 1198 | >> 16; |