On Sun, Sep 25, 2022 at 09:58:18PM +0200, Arnd Bergmann wrote:
On Sun, Sep 25, 2022, at 6:20 PM, Sasha Levin wrote:
On Sun, Sep 25, 2022 at 12:21:03PM +0200, Arnd Bergmann wrote:
On Sun, Sep 25, 2022, at 4:02 AM, Sasha Levin wrote:
This is a note to let you know that I've just added the patch titled
net: socket: remove register_gifconf
...
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
...
Author: Arnd Bergmann <arnd@xxxxxxxx>
[ Upstream commit b0e99d03778b2418aec20db99d97d19d25d198b6 ]
Since dynamic registration of the gifconf() helper is only used for
IPv4, and this can not be in a loadable module, this can be simplified
noticeably by turning it into a direct function call as a preparation
for cleaning up the compat handling.
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Stable-dep-of: 5641c751fe2f ("net: enetc: deny offload of tc-based
TSN features on VF interfaces")
Hi Sasha,
I don't see you got to this 'Stable-dep-of'. As far as I can tell,
the two are not related, and you don't need to backport my patch.
So the dependency chain for 5641c751fe2f ("net: enetc: deny offload of
tc-based TSN features on VF interfaces") looks something like:
5641c751fe2f ("net: enetc: deny offload of tc-based TSN features on VF
interfaces")
a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl")
a554bf96b49d ("dev_ioctl: pass SIOCDEVPRIVATE data separately")
ebb4a911e09a ("cxgb3: use ndo_siocdevprivate")
18787eeebd71 ("qeth: use ndo_siocdevprivate")
99b78a37a371 ("hamachi: use ndo_siocdevprivate")
232ec98ec35d ("bonding: use siocdevprivate")
b9067f5dc4a0 ("net: split out SIOCDEVPRIVATE handling from dev_ioctl")
29c4964822aa ("net: socket: rework compat_ifreq_ioctl()")
876f0bf9d0d5 ("net: socket: simplify dev_ifconf handling")
b0e99d03778b ("net: socket: remove register_gifconf")
dd98d2895de6 ("ethtool: improve compat ioctl handling")
a8c7629c622b ("s390/qeth: remove OSN support")
f92e1869d74e ("Add Mellanox BlueField Gigabit Ethernet driver")
d59a24fd1bdb ("net: gianfar: Convert to ndo_get_stats64 interface")
I didn't end up taking 5641c751fe2f so you're right - I'm going to drop
b0e99d03778 too.
Ok, thanks. I'm still confused about the rest of my series though:
While a76053707dbf does depend on the ones before it (and more I think),
5641c751fe2f should not have a dependency on a76053707dbf, right?
It does, because the following two hunks from a76053707dbf:
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index c84f6c226743..60d94e0a07d6 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -735,7 +735,7 @@ static const struct net_device_ops enetc_ndev_ops = {
.ndo_set_vf_vlan = enetc_pf_set_vf_vlan,
.ndo_set_vf_spoofchk = enetc_pf_set_vf_spoofchk,
.ndo_set_features = enetc_pf_set_features,
- .ndo_do_ioctl = enetc_ioctl,
+ .ndo_eth_ioctl = enetc_ioctl,
.ndo_setup_tc = enetc_setup_tc,
.ndo_bpf = enetc_setup_bpf,
.ndo_xdp_xmit = enetc_xdp_xmit,
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index 03090ba7e226..1a9d1e8b772c 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -99,7 +99,7 @@ static const struct net_device_ops enetc_ndev_ops = {
.ndo_get_stats = enetc_get_stats,
.ndo_set_mac_address = enetc_vf_set_mac_addr,
.ndo_set_features = enetc_vf_set_features,
- .ndo_do_ioctl = enetc_ioctl,
+ .ndo_eth_ioctl = enetc_ioctl,
.ndo_setup_tc = enetc_setup_tc,
};
Are needed by following ones from 5641c751fe2f:
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -750,3 +769,3 @@ static const struct net_device_ops enetc_ndev_ops = {
.ndo_eth_ioctl = enetc_ioctl,
- .ndo_setup_tc = enetc_setup_tc,
+ .ndo_setup_tc = enetc_pf_setup_tc,
.ndo_bpf = enetc_setup_bpf,
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index 4048101c42be..dfcaac302e24 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -104,3 +115,3 @@ static const struct net_device_ops enetc_ndev_ops = {
.ndo_eth_ioctl = enetc_ioctl,
- .ndo_setup_tc = enetc_setup_tc,
+ .ndo_setup_tc = enetc_vf_setup_tc,
};
Yes, this is just context.
--
Thanks,
Sasha
