Messages in this thread | | | Date | Tue, 20 Jul 2021 16:29:43 +0300 | From | Paul Fertser <> | Subject | Re: [PATCH v2 3/3] net/ncsi: add dummy response handler for Intel boards |
| |
On Tue, Jul 20, 2021 at 04:21:31PM +0300, Ivan Mikhaylov wrote: > Paul, I know about 'get mac address' and it was in my todo list. You can put it > before or after this patch series whenever you want, it doesn't interfere with > this one. Anyways, thanks for sharing it.
The patch in question modifies the same file in the same place, see:
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c index a94bb59793f0..b36c22ec4c3f 100644 --- a/net/ncsi/ncsi-rsp.c +++ b/net/ncsi/ncsi-rsp.c ... static struct ncsi_rsp_oem_handler { unsigned int mfr_id; int (*handler)(struct ncsi_request *nr); } ncsi_rsp_oem_handlers[] = { { NCSI_OEM_MFR_MLX_ID, ncsi_rsp_handler_oem_mlx }, - { NCSI_OEM_MFR_BCM_ID, ncsi_rsp_handler_oem_bcm } + { NCSI_OEM_MFR_BCM_ID, ncsi_rsp_handler_oem_bcm }, + { NCSI_OEM_MFR_INTEL_ID, ncsi_rsp_handler_oem_intel } };
And your patch:
Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com> --- net/ncsi/ncsi-rsp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c index 04bc50be5c01..d48374894817 100644 --- a/net/ncsi/ncsi-rsp.c +++ b/net/ncsi/ncsi-rsp.c ... static struct ncsi_rsp_oem_handler { unsigned int mfr_id; int (*handler)(struct ncsi_request *nr); } ncsi_rsp_oem_handlers[] = { { NCSI_OEM_MFR_MLX_ID, ncsi_rsp_handler_oem_mlx }, - { NCSI_OEM_MFR_BCM_ID, ncsi_rsp_handler_oem_bcm } + { NCSI_OEM_MFR_BCM_ID, ncsi_rsp_handler_oem_bcm }, + { NCSI_OEM_MFR_INTEL_ID, ncsi_rsp_handler_oem_intel } };
so it does conflict. I suggest if you decide to continue with this series rather than the userspace solution to include the MAC fetching patch in your submission instead of the stub handler.
-- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com
| |