---

yaml
---
r: 141183
b: refs/heads/master
c: 7dd33a4
h: refs/heads/master
i:
  141181: f972684
  141179: d2431af
  141175: fd80733
  141167: 7696395
  141151: bb802aa
  141119: 9336457
  141055: b8d03ea
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9d98d9f67e4ea2cdba136273513f131022da35
+refs/heads/master: 7dd33a43d5a8fe6f30697ac8295894e21d4cdc46

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);