Back out most of ebf05cb9f5

include/nuttx/wireless/wireless.h

@@ -63,7 +63,6 @@
  * interface.
  */
 
-/* IEEE802.11 */
 /* Wireless identification */
 
 #define SIOCSIWCOMMIT       _WLIOC(0x0001)  /* Commit pending changes to driver */
@@ -154,19 +153,6 @@
 
 #define SIOCSIWPMKSA        _WLIOC(0x0032)  /* PMKSA cache operation */
 
-/* IEEE802.15.4 6loWPAN
- *
- *  IEEE802.15.4 IOCTLs may be directed at one of three layers:
- *
- *  1. To the 6loWPAN network layer, as documented here,
- *  2. To the IEEE802.15.4 MAC layer, as documented in,
- *     include/nuttx/wireless/ieee802154/ioeee802154_mac.h, or to
- *  3. To the IEEE802.15.4 radio device layer, as documented in,
- *     include/nuttx/wireless/ieee802154/ioeee802154_radio.h.
- *
- * This is a placeholder; no 6LoWPAN IOCTL commands have been defined.
- */
-
 #define WL_FIRSTCHAR        0x0033
 #define WL_NNETCMDS         0x0032
 
@@ -369,35 +355,5 @@ struct iw_event
   union iwreq_data   u;     /* Fixed IOCTL payload */
 };
 
-/* 6loWPAN */
-/* This structure is used with the SIOCSWPANID IOCTL command to select the
- * PAN ID to join.
- */
-
-struct sixlowpan_panid_s
-{
-  uint16_t           panid; /* The PAN ID to join */
-};
-
-/* This union defines the data payload of an 6loWPAN or SIOCGWPANID ioctl
- * command and is used in struct sixlowpan_req_s below.
- */
-
-union sixlowpan_data
-{
-  struct sixlowpan_panid_s panid;  /* PAN ID to join */
-};
-
-/* This is the structure used to exchange data in wireless IOCTLs.  This
- * structure is the same as 'struct ifreq', but defined for use with
- * 6loWPAN IOCTLs.
- */
-
-struct sixlowpan_req_s
-{
-  char ifr_name[IFNAMSIZ];  /* Interface name, e.g. "wpan0" */
-  union sixlowpan_data u;   /* Data payload */
-};
-
 #endif /* CONFIG_DRIVERS_WIRELESS */
 #endif /* __INCLUDE_NUTTX_WIRELESS_WIRELESS_H */

net/netdev/netdev_ioctl.c

@@ -326,51 +326,6 @@ static void ioctl_set_ipv6addr(FAR net_ipv6addr_t outaddr,
 }
 #endif
 
-/****************************************************************************
- * Name: netdev_sixlowpan_ioctl
- *
- * Description:
- *   Perform 6loWPAN network device specific operations.
- *
- * Parameters:
- *   psock    Socket structure
- *   dev      Ethernet driver device structure
- *   cmd      The ioctl command
- *   req      The argument of the ioctl cmd
- *
- * Return:
- *   >=0 on success (positive non-zero values are cmd-specific)
- *   Negated errno returned on failure.
- *
- ****************************************************************************/
-
-#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NET_6LOWPAN)
-static int netdev_sixlowpan_ioctl(FAR struct socket *psock, int cmd,
-                                  FAR struct sixlowpan_req_s *req)
-{
-#if 0 /* None yet defined */
-  FAR struct ieee802154_driver_s *ieee;
-  int ret = -ENOTTY;
-
-  /* Verify that this is a valid wireless network IOCTL command */
-
-  if (_WLIOCVALID(cmd) && (unsigned)_IOC_NR(cmd) <= WL_NNETCMDS)
-    {
-      switch (cmd)
-        {
-
-          default:
-            return -ENOTTY;
-        }
-    }
-
-  return ret;
-#else
-  return -ENOTTY;
-#endif
-}
-#endif
-
 /****************************************************************************
  * Name: netdev_iee802154_ioctl
  *
@@ -1313,18 +1268,6 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
 
   ret = netdev_ifr_ioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg));
 
-#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NET_6LOWPAN)
-  /* Check for a 6loWPAN network command */
-
-  if (ret == -ENOTTY)
-    {
-      FAR struct sixlowpan_req_s *slpreq;
-
-      slpreq = (FAR struct sixlowpan_req_s *)((uintptr_t)arg);
-      ret    = netdev_sixlowpan_ioctl(psock, cmd, slpreq);
-    }
-#endif
-
 #if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL)
   /* Check for a wireless network command */