From 2d992716137aabf7f402fe60607f56856f7bdb77 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sun, 14 Nov 2004 17:59:05 +0000
Subject: Apply wireless-tools if-pre-up.d patch to make it not try to work
 against wlan-ng interfaces (shuts up the annoying error messages).

BKrev: 41979ce9ihlRWDGRzcpaivq-yS1DSg
---
 wireless-tools/wireless-tools/wireless-tools.if-pre-up | 8 ++++++++
 wireless-tools/wireless-tools_26.oe                    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
index 54ee709f8b..159402ceb8 100644
--- a/wireless-tools/wireless-tools/wireless-tools.if-pre-up
+++ b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
@@ -7,6 +7,14 @@ if [ ! -x $IWCONFIG ]; then
   exit 0
 fi
 
+# Detect and do nothing for linux-wlan-ng interfaces;
+# which are configured by thier own if-pre-up script.
+if [ -x /sbin/wlancfg ]; then
+  if /sbin/wlancfg show $IFACE >/dev/null 2>&1; then
+    exit 0
+  fi
+fi
+
 if [ -n "$IF_NEEDS_RESET" ]; then
   $IWPRIV "$IFACE" reset 1
   sleep 1
diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe
index 2390bd8aff..ee54a69bba 100644
--- a/wireless-tools/wireless-tools_26.oe
+++ b/wireless-tools/wireless-tools_26.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
 	   file://man.patch;patch=1 \
-- 
cgit v1.2.3