From 27ffa9d71f8043470fa1c4d3c058bc34540da655 Mon Sep 17 00:00:00 2001
From: Moritz Muehlenhoff <jmm@debian.org>
Date: Sun, 1 Feb 2009 13:29:02 +0100
Subject: [PATCH] --- yaml --- r: 141183 b: refs/heads/master c:
 7dd33a43d5a8fe6f30697ac8295894e21d4cdc46 h: refs/heads/master i:   141181:
 f97268444fae330bbf4f2a1261ba4362dfb01264   141179:
 d2431af8598a9c56d27be89b528e67d521f23019   141175:
 fd80733c5fe96a54ab71a5ff9a60b8ac85e86915   141167:
 7696395ec5a14d83ea8ce4e87cb36920314162f7   141151:
 bb802aa15ba0b921d7094f596921987dceccd2a1   141119:
 9336457d5586682c06a304234bc23277a97c3a8d   141055:
 b8d03ea2a60fa1b5e86ee066439abee94ada36bc v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/wlan-ng/prism2mgmt.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index d69dd4e1914a..6ef3ceef9736 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9d98d9f67e4ea2cdba136273513f131022da35
+refs/heads/master: 7dd33a43d5a8fe6f30697ac8295894e21d4cdc46
diff --git a/trunk/drivers/staging/wlan-ng/prism2mgmt.c b/trunk/drivers/staging/wlan-ng/prism2mgmt.c
index 3d9478c4a4b4..fe4e7ffddf24 100644
--- a/trunk/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/trunk/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1055,25 +1055,7 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
         result = hfa384x_drvr_setconfig(
 			hw, HFA384x_RID_CNFDESIREDSSID,
 			bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
-#if 0
-	/* we can use the new-fangled auto-unknown mode if the firmware
-	   is 1.3.3 or newer */
-	if (HFA384x_FIRMARE_VERSION(hw->ident_sta_fw.major,
-				    hw->ident_sta_fw.minor,
-				    hw->ident_sta_fw.variant) >=
-	    HFA384x_FIRMWARE_VERSION(1,3,3)) {
-		/* Set up the IBSS options */
-		reg =  HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS;
-		hfa384x_drvr_setconfig16(hw, HFA384x_RID_CREATEIBSS, reg);
-
-		/* Set the PortType */
-		port_type = HFA384x_PORTTYPE_IBSS;
-	} else {
-		port_type = HFA384x_PORTTYPE_BSS;
-	}
-#else
 	port_type = HFA384x_PORTTYPE_BSS;
-#endif
 	/* Set the PortType */
 	hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, port_type);