Skip to content

Commit 3e6860e

Browse files
committed
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says: ==================== i40e: Replace one-element arrays with flexible-array members Replace one-element arrays with flexible-array members in multiple structures. This results in no differences in binary output. * '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue: i40e: Replace one-element array with flex-array member in struct i40e_profile_aq_section i40e: Replace one-element array with flex-array member in struct i40e_section_table i40e: Replace one-element array with flex-array member in struct i40e_profile_segment i40e: Replace one-element array with flex-array member in struct i40e_package_header ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 7191c14 + 4bb28b2 commit 3e6860e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

drivers/net/ethernet/intel/i40e/i40e_ddp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static bool i40e_ddp_is_pkg_hdr_valid(struct net_device *netdev,
220220
netdev_err(netdev, "Invalid DDP profile - size is bigger than 4G");
221221
return false;
222222
}
223-
if (size < (sizeof(struct i40e_package_header) +
223+
if (size < (sizeof(struct i40e_package_header) + sizeof(u32) +
224224
sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {
225225
netdev_err(netdev, "Invalid DDP profile - size is too small.");
226226
return false;
@@ -281,7 +281,7 @@ int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,
281281
if (!i40e_ddp_is_pkg_hdr_valid(netdev, pkg_hdr, size))
282282
return -EINVAL;
283283

284-
if (size < (sizeof(struct i40e_package_header) +
284+
if (size < (sizeof(struct i40e_package_header) + sizeof(u32) +
285285
sizeof(struct i40e_metadata_segment) + sizeof(u32) * 2)) {
286286
netdev_err(netdev, "Invalid DDP recipe size.");
287287
return -EINVAL;

drivers/net/ethernet/intel/i40e/i40e_type.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ struct i40e_ddp_version {
14551455
struct i40e_package_header {
14561456
struct i40e_ddp_version version;
14571457
u32 segment_count;
1458-
u32 segment_offset[1];
1458+
u32 segment_offset[];
14591459
};
14601460

14611461
/* Generic segment header */
@@ -1486,12 +1486,12 @@ struct i40e_profile_segment {
14861486
struct i40e_ddp_version version;
14871487
char name[I40E_DDP_NAME_SIZE];
14881488
u32 device_table_count;
1489-
struct i40e_device_id_entry device_table[1];
1489+
struct i40e_device_id_entry device_table[];
14901490
};
14911491

14921492
struct i40e_section_table {
14931493
u32 section_count;
1494-
u32 section_offset[1];
1494+
u32 section_offset[];
14951495
};
14961496

14971497
struct i40e_profile_section_header {
@@ -1523,7 +1523,7 @@ struct i40e_profile_aq_section {
15231523
u16 flags;
15241524
u8 param[16];
15251525
u16 datalen;
1526-
u8 data[1];
1526+
u8 data[];
15271527
};
15281528

15291529
struct i40e_profile_info {

0 commit comments

Comments
 (0)