svn commit: r188562 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Fri Feb 13 05:49:03 2009
New Revision: 188562
URL: http://svn.freebsd.org/changeset/base/188562

Log:
  merge r188555: dd driver stat to count tx drops due to insufficient frag buffers

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/ath/if_ath.c
  projects/vap7/sys/dev/ath/if_athioctl.h
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)

Modified: projects/vap7/sys/dev/ath/if_ath.c
==============================================================================
--- projects/vap7/sys/dev/ath/if_ath.c	Fri Feb 13 05:48:18 2009	(r188561)
+++ projects/vap7/sys/dev/ath/if_ath.c	Fri Feb 13 05:49:03 2009	(r188562)
@@ -2071,7 +2071,6 @@ static void
 ath_start(struct ifnet *ifp)
 {
 	struct ath_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = ifp->if_l2com;
 	struct ieee80211_node *ni;
 	struct ath_buf *bf;
 	struct mbuf *m, *next;
@@ -2141,7 +2140,7 @@ ath_start(struct ifnet *ifp)
 		    !ath_txfrag_setup(sc, &frags, m, ni)) {
 			DPRINTF(sc, ATH_DEBUG_XMIT,
 			    "%s: out of txfrag buffers\n", __func__);
-			ic->ic_stats.is_tx_nobuf++;	/* XXX */
+			sc->sc_stats.ast_tx_nofrag++;
 			ath_freetx(m);
 			goto bad;
 		}

Modified: projects/vap7/sys/dev/ath/if_athioctl.h
==============================================================================
--- projects/vap7/sys/dev/ath/if_athioctl.h	Fri Feb 13 05:48:18 2009	(r188561)
+++ projects/vap7/sys/dev/ath/if_athioctl.h	Fri Feb 13 05:49:03 2009	(r188562)
@@ -117,7 +117,8 @@ struct ath_stats {
 	u_int16_t	ast_tdma_tsfadjm;/* TDMA slot adjust- (usec, smoothed)*/
 	u_int32_t	ast_tdma_ack;	/* TDMA tx failed 'cuz ACK required */
 	u_int32_t	ast_tx_raw_fail;/* raw tx failed 'cuz h/w down */
-	u_int32_t	ast_pad[15];
+	u_int32_t	ast_tx_nofrag;	/* tx dropped 'cuz no ath frag buffer */
+	u_int32_t	ast_pad[14];
 };
 
 #define	SIOCGATHSTATS	_IOWR('i', 137, struct ifreq)