svn commit: r282370 - head/sys/dev/wpi

[Adrian Chadd]

Author: adrian
Date: Sun May  3 22:10:28 2015
New Revision: 282370
URL: https://svnweb.freebsd.org/changeset/base/282370

Log:
  Remove this; it's currently a no-op.
  
  History note: it's good to document what the driver expects like this even
  if it's currently a no-op.
  
  Submitted by:	Andriy Voskoboinyk <s3erios at gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun May  3 20:56:33 2015	(r282369)
+++ head/sys/dev/wpi/if_wpi.c	Sun May  3 22:10:28 2015	(r282370)
@@ -4274,8 +4274,6 @@ wpi_run(struct wpi_softc *sc, struct iee
 	sc->rxon.flags = htole32(WPI_RXON_TSF | WPI_RXON_CTS_TO_SELF);
 	if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan))
 		sc->rxon.flags |= htole32(WPI_RXON_AUTO | WPI_RXON_24GHZ);
-	/* Short preamble and slot time are negotiated when associating. */
-	sc->rxon.flags &= ~htole32(WPI_RXON_SHPREAMBLE | WPI_RXON_SHSLOT);
 	if (ic->ic_flags & IEEE80211_F_SHSLOT)
 		sc->rxon.flags |= htole32(WPI_RXON_SHSLOT);
 	if (ic->ic_flags & IEEE80211_F_SHPREAMBLE)