On Sat, Jul 22, 2023 at 04:07:08PM +0300, Paul Fertser wrote: > Hello Greg, > > On Sat, Jul 22, 2023 at 02:48:58PM +0200, Greg KH wrote: > > On Sat, Jul 22, 2023 at 03:19:54PM +0300, Ivan Mikhaylov wrote: > > > On Sat, 2023-07-22 at 13:47 +0200, Greg KH wrote: > > > > On Sat, Jul 22, 2023 at 12:51:32AM +0300, Ivan Mikhaylov wrote: > > > > > On Thu, 2023-07-20 at 19:09 +0200, > > > > > gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > > > > > > > > > This is a note to let you know that I've just added the patch > > > > > > titled > > > > > > > > > > > > net/ncsi: change from ndo_set_mac_address to > > > > > > dev_set_mac_address > > > > > > > > > > > > to the 6.1-stable tree which can be found at: > > > > > > > > > > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > > > > > > > > > The filename of the patch is: > > > > > > net-ncsi-change-from-ndo_set_mac_address-to- > > > > > > dev_set_mac_address.patch > > > > > > and it can be found in the queue-6.1 subdirectory. > > > > > > > > > > > > If you, or anyone else, feels it should not be added to the > > > > > > stable > > > > > > tree, > > > > > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > > > > > > > > > > > > > From 790071347a0a1a89e618eedcd51c687ea783aeb3 Mon Sep 17 00:00:00 > > > > > > 2001 > > > > > > From: Ivan Mikhaylov <fr0st61te@xxxxxxxxx> > > > > > > Date: Wed, 7 Jun 2023 18:17:42 +0300 > > > > > > Subject: net/ncsi: change from ndo_set_mac_address to > > > > > > dev_set_mac_address > > > > > > > > > > > > From: Ivan Mikhaylov <fr0st61te@xxxxxxxxx> > > > > > > > > > > > > commit 790071347a0a1a89e618eedcd51c687ea783aeb3 upstream. > > > > > > > > > > > > Change ndo_set_mac_address to dev_set_mac_address because > > > > > > dev_set_mac_address provides a way to notify network layer about > > > > > > MAC > > > > > > change. In other case, services may not aware about MAC change > > > > > > and > > > > > > keep > > > > > > using old one which set from network adapter driver. > > > > > > > > > > > > As example, DHCP client from systemd do not update MAC address > > > > > > without > > > > > > notification from net subsystem which leads to the problem with > > > > > > acquiring > > > > > > the right address from DHCP server. > > > > > > > > > > > > Fixes: cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command") > > > > > > Cc: stable@xxxxxxxxxxxxxxx # v6.0+ 2f38e84 net/ncsi: make one > > > > > > oem_gma > > > > > > function for all mfr id > > > > > > Signed-off-by: Paul Fertser <fercerpav@xxxxxxxxx> > > > > > > Signed-off-by: Ivan Mikhaylov <fr0st61te@xxxxxxxxx> > > > > > > Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx> > > > > > > Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> > > > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > > > --- > > > > > > net/ncsi/ncsi-rsp.c | 5 +++-- > > > > > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > > > > > > > > > --- a/net/ncsi/ncsi-rsp.c > > > > > > +++ b/net/ncsi/ncsi-rsp.c > > > > > > @@ -616,7 +616,6 @@ static int ncsi_rsp_handler_oem_mlx_gma( > > > > > > { > > > > > > struct ncsi_dev_priv *ndp = nr->ndp; > > > > > > struct net_device *ndev = ndp->ndev.dev; > > > > > > - const struct net_device_ops *ops = ndev->netdev_ops; > > > > > > struct ncsi_rsp_oem_pkt *rsp; > > > > > > struct sockaddr saddr; > > > > > > int ret = 0; > > > > > > @@ -630,7 +629,9 @@ static int ncsi_rsp_handler_oem_mlx_gma( > > > > > > /* Set the flag for GMA command which should only be > > > > > > called > > > > > > once */ > > > > > > ndp->gma_flag = 1; > > > > > > > > > > > > - ret = ops->ndo_set_mac_address(ndev, &saddr); > > > > > > + rtnl_lock(); > > > > > > + ret = dev_set_mac_address(ndev, &saddr, NULL); > > > > > > + rtnl_unlock(); > > > > > > if (ret < 0) > > > > > > netdev_warn(ndev, "NCSI: 'Writing mac address to > > > > > > device failed\n"); > > > > > > > > > > > > > > > > > > > > > > > > Patches currently in stable-queue which might be from > > > > > > fr0st61te@xxxxxxxxx are > > > > > > > > > > > > queue-6.1/net-ncsi-change-from-ndo_set_mac_address-to- > > > > > > dev_set_mac_address.patch > > > > > > > > > > Greg, looks like here some problem, in this one > > > > > https://lore.kernel.org/all/20230607151742.6699-3-fr0st61te@xxxxxxxxx/ > > > > > > > > > > I made the reference on "2f38e84 net/ncsi: make one oem_gma > > > > > function > > > > > for all mfr id" which is need to be added first because it makes > > > > > all > > > > > vendor specific handlers in one, current patch addds fix only for > > > > > mlx/melanox which is not correct. Same thing for 6.4. > > > > > > > > That reference is NOT a commit, it is a blob that is the whole file, > > > > so > > > > the tools choked on it and I figured that someone got confused > > > > somewhere. There's nothing we can do with a blob git reference :( > > > > > > > > So I'll drop this from the queues now, please resubmit the proper > > > > patches as a series to the stable@xxxxxxxxxxxxxxx address backported, > > > > and we will be glad to queue them up for 6.4.y and 6.1.y. > > > > > > > > thanks, > > > > > > > > greg k-h > > > > > > Greg, sorry, looks like my mistake, I thought it was the series of 2 > > > patches, need I just add "Cc: stable@xxxxxxxxxxxxxxx" into first one > > > patch and just re-submit without any additional changes? Just want to > > > make sure that everything is correct before submitting again. > > > > How about just telling me the git ids, in order, that you want applied? > > If they apply cleanly, that will work just fine. > > 74b449b98dccdf24288d562f9d207fa066da793d > 790071347a0a1a89e618eedcd51c687ea783aeb3 Now both queued up, thanks. greg k-h
