Skip to content

Commit 08f85b5

Browse files
Jiawen WuNipaLocal
authored andcommitted
net: wangxun: limit tx_max_coalesced_frames_irq
Add limitation on tx_max_coalesced_frames_irq as 0 ~ 65535, because 'wx->tx_work_limit' is declared as a member of type u16. Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: NipaLocal <nipa@local>
1 parent bd4438c commit 08f85b5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

drivers/net/ethernet/wangxun/libwx/wx_ethtool.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,11 @@ int wx_set_coalesce(struct net_device *netdev,
334334
return -EOPNOTSUPP;
335335
}
336336

337-
if (ec->tx_max_coalesced_frames_irq)
338-
wx->tx_work_limit = ec->tx_max_coalesced_frames_irq;
337+
if (ec->tx_max_coalesced_frames_irq > WX_MAX_TX_WORK ||
338+
!ec->tx_max_coalesced_frames_irq)
339+
return -EINVAL;
340+
341+
wx->tx_work_limit = ec->tx_max_coalesced_frames_irq;
339342

340343
switch (wx->mac.type) {
341344
case wx_mac_sp:

drivers/net/ethernet/wangxun/libwx/wx_type.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ enum WX_MSCA_CMD_value {
411411
#define WX_7K_ITR 595
412412
#define WX_12K_ITR 336
413413
#define WX_20K_ITR 200
414+
#define WX_MAX_TX_WORK 65535
414415
#define WX_SP_MAX_EITR 0x00000FF8U
415416
#define WX_AML_MAX_EITR 0x00000FFFU
416417
#define WX_EM_MAX_EITR 0x00007FFCU

0 commit comments

Comments
 (0)