diff options
author | Raghu Vatsavayi <rvatsavayi@caviumnetworks.com> | 2015-06-13 04:11:50 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-13 05:16:04 +0300 |
commit | 5b173cf92729b02ff8207abd85bfcbbef3443b94 (patch) | |
tree | 09baef98398f69d506b059a721f77627ddfdac27 /drivers/net/ethernet/cavium/liquidio/liquidio_image.h | |
parent | ea70477099e2b2350ac3bdda0ddaefb6c68970dd (diff) | |
download | linux-5b173cf92729b02ff8207abd85bfcbbef3443b94.tar.xz |
Fix Cavium Liquidio build related errors and warnings
1) Fixed following sparse warnings:
lio_main.c:213:6: warning: symbol 'octeon_droq_bh' was not
declared. Should it be static?
lio_main.c:233:5: warning: symbol 'lio_wait_for_oq_pkts' was
not declared. Should it be static?
lio_main.c:3083:5: warning: symbol 'lio_nic_info' was not
declared. Should it be static?
lio_main.c:2618:16: warning: cast from restricted __be16
octeon_device.c:466:6: warning: symbol 'oct_set_config_info'
was not declared. Should it be static?
octeon_device.c:573:25: warning: cast to restricted __be32
octeon_device.c:582:29: warning: cast to restricted __be32
octeon_device.c:584:39: warning: cast to restricted __be32
octeon_device.c:594:13: warning: cast to restricted __be32
octeon_device.c:596:25: warning: cast to restricted __be32
octeon_device.c:613:25: warning: cast to restricted __be32
octeon_device.c:614:29: warning: cast to restricted __be64
octeon_device.c:615:29: warning: cast to restricted __be32
octeon_device.c:619:37: warning: cast to restricted __be32
octeon_device.c:623:33: warning: cast to restricted __be32
cn66xx_device.c:540:6: warning: symbol
'lio_cn6xxx_get_pcie_qlmport' was not declared. Should it be s
octeon_mem_ops.c:181:16: warning: cast to restricted __be64
octeon_mem_ops.c:190:16: warning: cast to restricted __be32
octeon_mem_ops.c:196:17: warning: incorrect type in initializer
2) Fix build errors corresponding to vmalloc on linux-next 4.1.
3) Liquidio now supports 64 bit only, modified Kconfig accordingly.
4) Fix some code alignment issues based on kernel build warnings.
Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/liquidio_image.h')
-rw-r--r-- | drivers/net/ethernet/cavium/liquidio/liquidio_image.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_image.h b/drivers/net/ethernet/cavium/liquidio/liquidio_image.h index 13c680bf0556..93819bd8602b 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_image.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_image.h @@ -35,9 +35,9 @@ #define LIO_MAX_IMAGES 16 #define LIO_NIC_MAGIC 0x434E4943 /* "CNIC" */ struct octeon_firmware_desc { - u64 addr; - u32 len; - u32 crc32; /* crc32 of image */ + __be64 addr; + __be32 len; + __be32 crc32; /* crc32 of image */ }; /* Following the header is a list of 64-bit aligned binary images, @@ -45,13 +45,13 @@ struct octeon_firmware_desc { * Numeric fields are in network byte order. */ struct octeon_firmware_file_header { - u32 magic; + __be32 magic; char version[LIO_MAX_FIRMWARE_VERSION_LEN]; char bootcmd[LIO_MAX_BOOTCMD_LEN]; - u32 num_images; + __be32 num_images; struct octeon_firmware_desc desc[LIO_MAX_IMAGES]; - u32 pad; - u32 crc32; /* header checksum */ + __be32 pad; + __be32 crc32; /* header checksum */ }; #endif /* _LIQUIDIO_IMAGE_H_ */ |