Skip to content

Commit b8b8e51

Browse files
committed
Merge: net/benet: driver update
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6983 JIRA: https://issues.redhat.com/browse/RHEL-72658 This MR updates the benet driver to upstream kernel net-next. Tested: compiled only Signed-off-by: Dennis Chen <[email protected]> Approved-by: Kamal Heib <[email protected]> Approved-by: José Ignacio Tornos Martínez <[email protected]> Approved-by: Petr Oros <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 21da190 + bb20a74 commit b8b8e51

File tree

4 files changed

+131
-131
lines changed

4 files changed

+131
-131
lines changed

drivers/net/ethernet/emulex/benet/be.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ struct be_adapter {
562562
struct be_dma_mem mbox_mem_alloced;
563563

564564
struct be_mcc_obj mcc_obj;
565-
struct mutex mcc_lock; /* For serializing mcc cmds to BE card */
565+
spinlock_t mcc_lock; /* For serializing mcc cmds to BE card */
566566
spinlock_t mcc_cq_lock;
567567

568568
u16 cfg_num_rx_irqs; /* configured via set-channels */
@@ -966,9 +966,7 @@ void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
966966
void be_link_status_update(struct be_adapter *adapter, u8 link_status);
967967
void be_parse_stats(struct be_adapter *adapter);
968968
int be_load_fw(struct be_adapter *adapter, u8 *func);
969-
bool be_is_wol_supported(struct be_adapter *adapter);
970969
bool be_pause_supported(struct be_adapter *adapter);
971-
u32 be_get_fw_log_level(struct be_adapter *adapter);
972970
int be_update_queues(struct be_adapter *adapter);
973971
int be_poll(struct napi_struct *napi, int budget);
974972
void be_eqd_update(struct be_adapter *adapter, bool force_update);

0 commit comments

Comments
 (0)