Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are two staging driver fixups for 4.17-rc3.

  The first is the remaining stragglers of the irda code removal that
  you pointed out during the merge window. The second is a fix for the
  wilc1000 driver due to a patch that got merged in 4.17-rc1.

  Both of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
  staging: irda: remove remaining remants of irda code removal

7 files changed, 2 insertions, 68 deletions

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 84bb74dcae12..7f7413e597f3 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -217,7 +217,6 @@ Code  Seq#(hex)	Include File		Comments
 'd'     02-40   pcmcia/ds.h             conflict!
 'd'     F0-FF   linux/digi1.h
 'e'     all     linux/digi1.h           conflict!
-'e'     00-1F   drivers/net/irda/irtty-sir.h    conflict!
 'f'     00-1F   linux/ext2_fs.h         conflict!
 'f'     00-1F   linux/ext3_fs.h         conflict!
 'f'     00-0F   fs/jfs/jfs_dinode.h     conflict!
@@ -247,7 +246,6 @@ Code  Seq#(hex)	Include File		Comments
 'm'     all     linux/synclink.h        conflict!
 'm'     00-19   drivers/message/fusion/mptctl.h conflict!
 'm'     00      drivers/scsi/megaraid/megaraid_ioctl.h  conflict!
-'m'     00-1F   net/irda/irmod.h        conflict!
 'n'     00-7F   linux/ncp_fs.h and fs/ncpfs/ioctl.c
 'n'     80-8F   uapi/linux/nilfs2_api.h NILFS2
 'n'     E0-FF   linux/matroxfb.h        matroxfb
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index b583a73cf95f..35ffaa281b26 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -2126,18 +2126,3 @@ max_dgram_qlen - INTEGER
 
         Default: 10
 
-
-UNDOCUMENTED:
-
-/proc/sys/net/irda/*
-        fast_poll_increase FIXME
-        warn_noreply_time FIXME
-        discovery_slots FIXME
-        slot_timeout FIXME
-        max_baud_rate FIXME
-        discovery_timeout FIXME
-        lap_keepalive_time FIXME
-        max_noreply_time FIXME
-        max_tx_data_size FIXME
-        max_tx_window FIXME
-        min_tx_turn_time FIXME
diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst
index 00cecf1fcba9..633be1043690 100644
--- a/Documentation/process/magic-number.rst
+++ b/Documentation/process/magic-number.rst
@@ -157,8 +157,5 @@ memory management. See ``include/sound/sndmagic.h`` for complete list of them. M
 OSS sound drivers have their magic numbers constructed from the soundcard PCI
 ID - these are not listed here as well.
 
-IrDA subsystem also uses large number of own magic numbers, see
-``include/net/irda/irda.h`` for a complete list of them.
-
 HFS is another larger user of magic numbers - you can find them in
 ``fs/hfs/hfs.h``.
diff --git a/MAINTAINERS b/MAINTAINERS
index cc996af953b8..1901ef510b43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7410,16 +7410,6 @@ S:	Obsolete
 F:      include/uapi/linux/ipx.h
 F:      drivers/staging/ipx/
 
-IRDA SUBSYSTEM
-M:      Samuel Ortiz <samuel@sortiz.org>
-L:      irda-users@lists.sourceforge.net (subscribers-only)
-L:      netdev@vger.kernel.org
-W:      http://irda.sourceforge.net/
-S:      Obsolete
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
-F:      Documentation/networking/irda.txt
-F:      drivers/staging/irda/
-
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:      Marc Zyngier <marc.zyngier@arm.com>
 S:      Maintained
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6b5300ca44a6..885f5fcead77 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1390,7 +1390,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
         }
 
         if (hif_drv->usr_conn_req.ies) {
-                conn_info.req_ies = kmemdup(conn_info.req_ies,
+                conn_info.req_ies = kmemdup(hif_drv->usr_conn_req.ies,
                                             hif_drv->usr_conn_req.ies_len,
                                             GFP_KERNEL);
                 if (conn_info.req_ies)
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
index 0f272818a4d2..6b58371b1f0d 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -780,24 +780,6 @@ enum {
         NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
 };
 
-/* proc/sys/net/irda */
-enum {
-        NET_IRDA_DISCOVERY=1,
-        NET_IRDA_DEVNAME=2,
-        NET_IRDA_DEBUG=3,
-        NET_IRDA_FAST_POLL=4,
-        NET_IRDA_DISCOVERY_SLOTS=5,
-        NET_IRDA_DISCOVERY_TIMEOUT=6,
-        NET_IRDA_SLOT_TIMEOUT=7,
-        NET_IRDA_MAX_BAUD_RATE=8,
-        NET_IRDA_MIN_TX_TURN_TIME=9,
-        NET_IRDA_MAX_TX_DATA_SIZE=10,
-        NET_IRDA_MAX_TX_WINDOW=11,
-        NET_IRDA_MAX_NOREPLY_TIME=12,
-        NET_IRDA_WARN_NOREPLY_TIME=13,
-        NET_IRDA_LAP_KEEPALIVE_TIME=14,
-};
-
 
 /* CTL_FS names: */
 enum
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index e8c0dab4fd65..07148b497451 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -704,24 +704,6 @@ static const struct bin_table bin_net_netfilter_table[] = {
         {}
 };
 
-static const struct bin_table bin_net_irda_table[] = {
-        { CTL_INT,      NET_IRDA_DISCOVERY,             "discovery" },
-        { CTL_STR,      NET_IRDA_DEVNAME,               "devname" },
-        { CTL_INT,      NET_IRDA_DEBUG,                 "debug" },
-        { CTL_INT,      NET_IRDA_FAST_POLL,             "fast_poll_increase" },
-        { CTL_INT,      NET_IRDA_DISCOVERY_SLOTS,       "discovery_slots" },
-        { CTL_INT,      NET_IRDA_DISCOVERY_TIMEOUT,     "discovery_timeout" },
-        { CTL_INT,      NET_IRDA_SLOT_TIMEOUT,          "slot_timeout" },
-        { CTL_INT,      NET_IRDA_MAX_BAUD_RATE,         "max_baud_rate" },
-        { CTL_INT,      NET_IRDA_MIN_TX_TURN_TIME,      "min_tx_turn_time" },
-        { CTL_INT,      NET_IRDA_MAX_TX_DATA_SIZE,      "max_tx_data_size" },
-        { CTL_INT,      NET_IRDA_MAX_TX_WINDOW,         "max_tx_window" },
-        { CTL_INT,      NET_IRDA_MAX_NOREPLY_TIME,      "max_noreply_time" },
-        { CTL_INT,      NET_IRDA_WARN_NOREPLY_TIME,     "warn_noreply_time" },
-        { CTL_INT,      NET_IRDA_LAP_KEEPALIVE_TIME,    "lap_keepalive_time" },
-        {}
-};
-
 static const struct bin_table bin_net_table[] = {
         { CTL_DIR,      NET_CORE,               "core",         bin_net_core_table },
         /* NET_ETHER not used */
@@ -743,7 +725,7 @@ static const struct bin_table bin_net_table[] = {
         { CTL_DIR,      NET_LLC,                "llc",          bin_net_llc_table },
         { CTL_DIR,      NET_NETFILTER,          "netfilter",    bin_net_netfilter_table },
         /* NET_DCCP "dccp" no longer used */
-        { CTL_DIR,      NET_IRDA,               "irda",         bin_net_irda_table },
+        /* NET_IRDA "irda" no longer used */
         { CTL_INT,      2089,                   "nf_conntrack_max" },
         {}
 };