[Madwifi-cvs] madwifi/ath if_ath.c,1.36.2.20,1.36.2.21

[Sebastian W. <to...@us...>]

Update of /cvsroot/madwifi/madwifi/ath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26068/ath

Modified Files:
      Tag: BSD
	if_ath.c 
Log Message:
- reclaim buffer if nothing to do with it
- disable led till it is fixed (tasklets)
- make clear that key_begin, key_end are not yet ok (blocks mgmt)


Index: if_ath.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v
retrieving revision 1.36.2.20
retrieving revision 1.36.2.21
diff -C2 -d -r1.36.2.20 -r1.36.2.21
*** if_ath.c	23 Feb 2005 18:09:22 -0000	1.36.2.20
--- if_ath.c	24 Feb 2005 13:55:09 -0000	1.36.2.21
***************
*** 497,501 ****
  	 * support with a sysctl.
  	 */
! 	sc->sc_softled = (devid == AR5212_DEVID_IBM || devid == AR5211_DEVID);
  	if (sc->sc_softled) {
  		ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
--- 497,502 ----
  	 * support with a sysctl.
  	 */
! 	//sc->sc_softled = (devid == AR5212_DEVID_IBM || devid == AR5211_DEVID);
! 	sc->sc_softled = 0;
  	if (sc->sc_softled) {
  		ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
***************
*** 1208,1213 ****
  		IF_DEQUEUE(&ic->ic_mgtq, skb0);
  		if (skb0 == NULL) {
! 			if (!skb)		/* NB: no data (called for mgmt) */
  				break;
  			/*
  			 * No data frames go out unless we're associated; this
--- 1209,1218 ----
  		IF_DEQUEUE(&ic->ic_mgtq, skb0);
  		if (skb0 == NULL) {
! 			if (!skb) {		/* NB: no data (called for mgmt) */
! 				ATH_TXBUF_LOCK(sc);
! 				STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
! 				ATH_TXBUF_UNLOCK(sc);
  				break;
+ 			}
  			/*
  			 * No data frames go out unless we're associated; this
***************
*** 1683,1689 ****
  	 * TODO: can cause bugs
  	 */
  	if (!in_softirq())
  		tasklet_disable(&sc->sc_rxtq);
! 	netif_stop_queue(dev);
  }
  
--- 1688,1696 ----
  	 * TODO: can cause bugs
  	 */
+ #if 1
  	if (!in_softirq())
  		tasklet_disable(&sc->sc_rxtq);
! #endif
! 	netif_stop_queue(dev);	// TODO: find a way to not block mgmt frames
  }
  
***************
*** 1696,1701 ****
--- 1703,1710 ----
  	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
  	netif_start_queue(dev);
+ #if 1
  	if (!in_softirq())		/* NB: see above */
  		tasklet_enable(&sc->sc_rxtq);
+ #endif
  }
  
***************
*** 3219,3222 ****
--- 3228,3232 ----
  			 * debugging/diagnostics.
  			 */
+ 			printk("%s: wep key null\n", __func__);
  			return -EIO;
  		}