[Devel] [PATCH RHEL9 COMMIT] Revert "veth: Resurrect dummy SIOCSVENET ioctl"

Konstantin Khorenko khorenko at virtuozzo.com
Tue Jun 7 14:49:20 MSK 2022


The commit is pushed to "branch-rh9-5.14.0-70.13.1.vz9.16.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-70.13.1.vz9.16.2
------>
commit 5695620f9f5eeda0edbff5c601e45c3ddc433de7
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Tue Jun 7 14:47:14 2022 +0300

    Revert "veth: Resurrect dummy SIOCSVENET ioctl"
    
    This reverts commit 1dfe00d34d1c74a856c72ebb0b102045fbaf8f62.
    
    vzctl now is ready to venet kernel code absence, so
    drop this leftover.
    
    https://jira.sw.ru/browse/PSBM-139506
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 drivers/net/veth.c        | 2 --
 include/uapi/linux/veth.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 0bfb66fcc1ab..98577a12f35d 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1576,8 +1576,6 @@ static int vzethdev_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
 		return -EPERM;
 
 	switch (cmd) {
-	case SIOCSVENET:
-		return 0;
 	case SIOCSFIXEDADDR:
 		if (ifr->ifr_ifru.ifru_flags)
 			dev->ve_features |= NETIF_F_FIXED_ADDR;
diff --git a/include/uapi/linux/veth.h b/include/uapi/linux/veth.h
index ccc020590969..a02adcd350b0 100644
--- a/include/uapi/linux/veth.h
+++ b/include/uapi/linux/veth.h
@@ -10,7 +10,6 @@ enum {
 #define VETH_INFO_MAX	(__VETH_INFO_MAX - 1)
 };
 
-#define SIOCSVENET	(SIOCDEVPRIVATE + 0xf)
 #define SIOCSFIXEDADDR	(SIOCDEVPRIVATE + 0xe)
 
 #endif


More information about the Devel mailing list