diff options
| author | John W. Linville | 2013-01-28 19:54:03 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-01-28 19:54:03 +0100 |
| commit | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (patch) | |
| tree | ed690568a27b7231b8a507e8ba07c1ae34868e5c /drivers/net/wireless/ath/ath9k/debug.h | |
| parent | ath9k_hw: remove a useless WARN_ON (diff) | |
| parent | mwifiex: fix typo in PCIe adapter NULL check (diff) | |
| download | kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.gz kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.xz kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/debug.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h index b19bed7f74c2..a22c0d780700 100644 --- a/drivers/net/wireless/ath/ath9k/debug.h +++ b/drivers/net/wireless/ath/ath9k/debug.h @@ -217,7 +217,6 @@ struct ath_tx_stats { * @rx_oom_err: No. of frames dropped due to OOM issues. * @rx_rate_err: No. of frames dropped due to rate errors. * @rx_too_many_frags_err: Frames dropped due to too-many-frags received. - * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH. * @rx_beacons: No. of beacons received. * @rx_frags: No. of rx-fragements received. */ @@ -236,7 +235,6 @@ struct ath_rx_stats { u32 rx_oom_err; u32 rx_rate_err; u32 rx_too_many_frags_err; - u32 rx_drop_rxflush; u32 rx_beacons; u32 rx_frags; }; |