diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-27 13:24:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-27 13:24:43 +0100 |
| commit | 5ffcba41de5579566f7d6933b96e8ca63335f790 (patch) | |
| tree | 62ddc9a532c6b03892af89ab6eead38716ef39cd /include | |
| parent | 2f0f6b176e083b08667b22d52eaf56d8403ff6f4 (diff) | |
| parent | 28ec53f3a830750f1b5ccf73cb13dae66ade1660 (diff) | |
Merge branch 'smc-updates'
Wenjia Zhang says:
====================
net/smc: updates 2022-07-25
please apply the following patches to netdev's net-next tree.
These patches do some preparation to make ISM available for uses beyond
SMC-D, and a bunch of cleanups.
v2: add "Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/smc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/smc.h b/include/net/smc.h index 37f829d9c6e5..c926d3313e05 100644 --- a/include/net/smc.h +++ b/include/net/smc.h @@ -72,7 +72,7 @@ struct smcd_ops { int (*move_data)(struct smcd_dev *dev, u64 dmb_tok, unsigned int idx, bool sf, unsigned int offset, void *data, unsigned int size); - void (*get_system_eid)(struct smcd_dev *dev, u8 **eid); + u8* (*get_system_eid)(void); u16 (*get_chid)(struct smcd_dev *dev); }; @@ -101,5 +101,5 @@ int smcd_register_dev(struct smcd_dev *smcd); void smcd_unregister_dev(struct smcd_dev *smcd); void smcd_free_dev(struct smcd_dev *smcd); void smcd_handle_event(struct smcd_dev *dev, struct smcd_event *event); -void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit); +void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit, u16 dmbemask); #endif /* _SMC_H */ |