Skip to content

Commit a4989be

Browse files
committed
Merge branch 'eth-bnxt-fix-a-couple-of-w-1-c-1-warnings'
Jakub Kicinski says: ==================== eth: bnxt: fix a couple of W=1 C=1 warnings Fix a couple of build warnings. ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents b10d10a + 9f49db6 commit a4989be

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets,
130130
BW_VALUE_UNIT_PERCENT1_100);
131131
}
132132
data = &req->unused_0 + qidx * (sizeof(cos2bw) - 4);
133-
memcpy(data, &cos2bw.queue_id, sizeof(cos2bw) - 4);
133+
memcpy(data, &cos2bw.cfg, sizeof(cos2bw) - 4);
134134
if (qidx == 0) {
135135
req->queue_id0 = cos2bw.queue_id;
136136
req->unused_0 = 0;

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ struct bnxt_cos2bw_cfg {
2727
u8 queue_id;
2828
__le32 min_bw;
2929
__le32 max_bw;
30-
#define BW_VALUE_UNIT_PERCENT1_100 (0x1UL << 29)
3130
u8 tsa;
3231
u8 pri_lvl;
3332
u8 bw_weight;
3433
);
34+
/* for min_bw / max_bw */
35+
#define BW_VALUE_UNIT_PERCENT1_100 (0x1UL << 29)
3536
u8 unused;
3637
};
3738

0 commit comments

Comments
 (0)