[pkgsrc/trunk]: pkgsrc/net/xfce4-wavelan-plugin/patches xfce4-wavelan-plugin:...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a43c889f370b
branches:  trunk
changeset: 338146:a43c889f370b
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Aug 19 04:59:26 2019 +0000

description:
xfce4-wavelan-plugin: remove patch that's no longer needed

diffstat:

 net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c |  245 ----------
 1 files changed, 0 insertions(+), 245 deletions(-)

diffs (249 lines):

diff -r 7f2bdb094816 -r a43c889f370b net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c
--- a/net/xfce4-wavelan-plugin/patches/patch-panel-plugin_wi__bsd.c     Mon Aug 19 04:58:19 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-$NetBSD: patch-panel-plugin_wi__bsd.c,v 1.2 2017/06/20 22:30:56 youri Exp $
-
-Add NetBSD support and fix FreeBSD.
-
---- panel-plugin/wi_bsd.c.orig 2016-05-01 15:53:40.000000000 +0000
-+++ panel-plugin/wi_bsd.c
-@@ -26,14 +26,9 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__)
--#define __FreeBSD_kernel__ __FreeBSD__
--#endif
--#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
--#define __FreeBSD_kernel_version __FreeBSD_version
--#endif
-+#include <sys/param.h>
- 
--#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__) 
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) 
- 
- #include <sys/types.h>
- #include <sys/cdefs.h>
-@@ -44,20 +39,14 @@
- 
- #include <net/if.h>
- #include <net/if_media.h>
--#ifdef __FreeBSD_kernel__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
- #include <sys/endian.h>
--#if __FreeBSD_kernel_version >= 700000
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <net80211/ieee80211_ioctl.h>
- #else
--#include <net/if_var.h>
--#include <net/ethernet.h>
--#include <dev/wi/if_wavelan_ieee.h>
--#endif
--#else
- #ifdef __NetBSD__
- #include <net80211/ieee80211.h>
- #include <net80211/ieee80211_ioctl.h>
-@@ -107,13 +96,9 @@ struct wi_device
- };
- 
- static int _wi_carrier(const struct wi_device *);
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static int _wi_vendor(const struct wi_device *, char *, size_t);
--#if __FreeBSD_kernel_version > 700000
- static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *);
--#else
--static int _wi_getval(const struct wi_device *, struct wi_req *);
--#endif
- #endif
- static int _wi_netname(const struct wi_device *, char *, size_t);
- static int _wi_quality(const struct wi_device *, int *);
-@@ -164,7 +149,7 @@ wi_query(struct wi_device *device, struc
-   strlcpy(stats->ws_qunit, "dBm", 4);
- #endif
-   /* check vendor (independent of carrier state) */
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-   if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)
-     return(result);
- #endif
-@@ -305,12 +290,10 @@ _wi_rate(const struct wi_device *device,
- }
- #endif
- 
--/* seems only FreeBSD supports this operation */
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static int
- _wi_vendor(const struct wi_device *device, char *buffer, size_t len)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-    /*
-     * We use sysctl to get a device description
-     */
-@@ -327,59 +310,30 @@ _wi_vendor(const struct wi_device *devic
-    dev_number = (int)strtol(c, NULL, 10);
-    *c = '\0';
- 
-+   /*
-+    * Also, wlan doesn't present dev.wlan.N.%desc, need to use
-+    * underlying driver name, instead: dev.ath.0.%desc, so we
-+    * need to get the parent's name.
-+    */
-+   if(strcmp(dev_name, "wlan") == 0) {
-+      snprintf(mib, sizeof(mib), "net.%s.%d.%%parent", dev_name, dev_number);
-+      if(sysctlbyname(mib, dev_name, &len, NULL, 0) == -1)
-+         return (WI_NOSUCHDEV);
-+
-+      c = dev_name;
-+      while(!isdigit(*c)) c++;
-+      dev_number = (int)strtol(c, NULL, 10);
-+      *c = '\0';
-+      len = WI_MAXSTRLEN;
-+   }
-+
-    snprintf(mib, sizeof(mib), "dev.%s.%d.%%desc", dev_name, dev_number);
-    if(sysctlbyname(mib, buffer, &len, NULL, 0) == -1)
-       return (WI_NOSUCHDEV);
--#else
--#define WI_RID_STA_IDENTITY_LUCENT    0x1
--#define WI_RID_STA_IDENTITY_PRISMII   0x2
--#define WI_RID_STA_IDENTITY_SAMSUNG   0x3
--#define WI_RID_STA_IDENTITY_DLINK     0x6
--  const char* vendor = "Unknown";
--  struct wi_req wr;
--  int result;
--
--  bzero((void*)&wr, sizeof(wr));
--  wr.wi_len = WI_MAX_DATALEN;
--  wr.wi_type = WI_RID_STA_IDENTITY;
--
--  if ((result = _wi_getval(device, &wr)) != WI_OK){
--    /* For the Atheros, IDENTITY does not work. */
--    if (strcmp(device->interface, "ath") != 0)
--      return(result);
--  }
--  else if (wr.wi_len < 4)
--    return(WI_NOSUCHDEV);
--
--  switch (wr.wi_val[1]) {
--  case WI_RID_STA_IDENTITY_LUCENT:
--    vendor = "Lucent";
--    break;
--
--  case WI_RID_STA_IDENTITY_PRISMII:
--    vendor = "generic PRISM II";
--    break;
--
--  case WI_RID_STA_IDENTITY_SAMSUNG:
--              vendor = "Samsung";
--              break;
--      case WI_RID_STA_IDENTITY_DLINK:
--              vendor = "D-Link";
--              break;
--  }
--
--  snprintf(buffer, len, "%s (ID %d, version %d.%d)", vendor,
--      wr.wi_val[0], wr.wi_val[2], wr.wi_val[3]);
--#endif
- 
-   return(WI_OK);
- }
--#endif /* wi_vendor */
- 
--/* NetBSD and FreeBSD 6.x uses old wi_* API */
--#if defined(__NetBSD__) || defined(__FreeBSD_kernel__)
--/* FreeBSD 7.x use its own new iee80211 API */
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
- static int
- _wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan)
- {
-@@ -404,7 +358,9 @@ _wi_getval(const struct wi_device *devic
- 
-    return(WI_OK);
- }
--#else
-+#endif
-+
-+#if defined(__NetBSD__)
- static int
- _wi_getval(const struct wi_device *device, struct wi_req *wr)
- {
-@@ -420,10 +376,11 @@ _wi_getval(const struct wi_device *devic
-   return(WI_OK);
- }
- #endif
-+
- static int
- _wi_netname(const struct wi_device *device, char *buffer, size_t len)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    struct ieee80211req ireq;
- 
-    memset(&ireq, 0, sizeof(ireq));
-@@ -434,7 +391,7 @@ _wi_netname(const struct wi_device *devi
-    ireq.i_len = len; 
-    if (ioctl(device->socket, SIOCG80211, &ireq) < 0) 
-       return WI_NOSUCHDEV;
--#else
-+#elif defined(__NetBSD__)
-   struct wi_req wr;
-   int result;
- 
-@@ -454,7 +411,7 @@ _wi_netname(const struct wi_device *devi
- static int
- _wi_quality(const struct wi_device *device, int *quality)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    struct ieee80211req_scan_result req;
-    int result;
-    bzero(&req, sizeof(req));
-@@ -462,8 +419,16 @@ _wi_quality(const struct wi_device *devi
-    if((result = _wi_getval(device, &req)) != WI_OK)
-       return (result);
- 
--   *quality = req.isr_rssi;
--#else
-+   /*
-+    * FreeBSD's wlan stats:
-+    * signal (in dBm) = rssi * 2 + noise;
-+    * quality_bars    = 4 * (signal - noise);
-+    * or
-+    * quality_bars    = rssi * 8;
-+    * but, per wi_query(), above, we need to return strength in dBm, so... 
-+    */
-+   *quality = req.isr_rssi * 2 + req.isr_noise;
-+#elif defined(__NetBSD__)
-   struct wi_req wr;
-   int result;
- 
-@@ -486,7 +451,7 @@ _wi_quality(const struct wi_device *devi
- static int
- _wi_rate(const struct wi_device *device, int *rate)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    struct ieee80211req_scan_result req;
-    int result, i, high;
-    bzero(&req, sizeof(req));
-@@ -499,7 +464,7 @@ _wi_rate(const struct wi_device *device,
-          high = req.isr_rates[i] & IEEE80211_RATE_VAL;
-    
-    *rate = high / 2;
--#else
-+#elif defined(__NetBSD__)
-   struct wi_req wr;
-   int result;
- 
-@@ -516,5 +481,4 @@ _wi_rate(const struct wi_device *device,
-   return(WI_OK);
- }
- 
--#endif  /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */
- #endif