mptcp: add port parameter for mptcp_pm_announce_addr

[mirror_ubuntu-jammy-kernel.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 6e6cccc2104f70093aaf92e13fb23400254d1bc2..bfef11ba35b8fa2a121ccabd328efa39c2d80f65 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -52,6 +52,7 @@
  *     Based upon Swansea University Computer Society NET3.039
  */
 
+#include <linux/ethtool.h>
 #include <linux/mm.h>
 #include <linux/socket.h>
 #include <linux/file.h>
@@ -64,7 +65,6 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 #include <linux/if_bridge.h>
-#include <linux/if_frad.h>
 #include <linux/if_vlan.h>
 #include <linux/ptp_classify.h>
 #include <linux/init.h>
@@ -1027,17 +1027,6 @@ void vlan_ioctl_set(int (*hook) (struct net *, void __user *))
 }
 EXPORT_SYMBOL(vlan_ioctl_set);
 
-static DEFINE_MUTEX(dlci_ioctl_mutex);
-static int (*dlci_ioctl_hook) (unsigned int, void __user *);
-
-void dlci_ioctl_set(int (*hook) (unsigned int, void __user *))
-{
-       mutex_lock(&dlci_ioctl_mutex);
-       dlci_ioctl_hook = hook;
-       mutex_unlock(&dlci_ioctl_mutex);
-}
-EXPORT_SYMBOL(dlci_ioctl_set);
-
 static long sock_do_ioctl(struct net *net, struct socket *sock,
                          unsigned int cmd, unsigned long arg)
 {
@@ -1156,17 +1145,6 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                                err = vlan_ioctl_hook(net, argp);
                        mutex_unlock(&vlan_ioctl_mutex);
                        break;
-               case SIOCADDDLCI:
-               case SIOCDELDLCI:
-                       err = -ENOPKG;
-                       if (!dlci_ioctl_hook)
-                               request_module("dlci");
-
-                       mutex_lock(&dlci_ioctl_mutex);
-                       if (dlci_ioctl_hook)
-                               err = dlci_ioctl_hook(cmd, argp);
-                       mutex_unlock(&dlci_ioctl_mutex);
-                       break;
                case SIOCGSKNS:
                        err = -EPERM;
                        if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
@@ -3427,8 +3405,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
        case SIOCBRDELBR:
        case SIOCGIFVLAN:
        case SIOCSIFVLAN:
-       case SIOCADDDLCI:
-       case SIOCDELDLCI:
        case SIOCGSKNS:
        case SIOCGSTAMP_NEW:
        case SIOCGSTAMPNS_NEW: