aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_mac.c
diff options
context:
space:
mode:
authorUlrich Kunitz <kune@deine-taler.de>2007-10-02 13:36:53 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:09 -0400
commit937a049dd903bd810d858d0303cf86af9eb08b6f (patch)
tree22043f905ea2ab4002c1a51044e471880d11714c /drivers/net/wireless/zd1211rw/zd_mac.c
parent09703f5e79a64c744721b9c27502075232ba0ea2 (diff)
[ZD1211RW]: Removed zd_util.c and zd_util.h
The kernel now provides a generic hexdump implementation should we need it again, so we can remove it from zd1211rw. After removing that, only one single-user function is left in zd_util. Move that to zd_mac and remove zd_util. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 06b342b3979..a903645e157 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -28,7 +28,6 @@
28#include "zd_ieee80211.h" 28#include "zd_ieee80211.h"
29#include "zd_netdev.h" 29#include "zd_netdev.h"
30#include "zd_rf.h" 30#include "zd_rf.h"
31#include "zd_util.h"
32 31
33static void ieee_init(struct ieee80211_device *ieee); 32static void ieee_init(struct ieee80211_device *ieee);
34static void softmac_init(struct ieee80211softmac_device *sm); 33static void softmac_init(struct ieee80211softmac_device *sm);
@@ -1066,7 +1065,8 @@ static int fill_rx_stats(struct ieee80211_rx_stats *stats,
1066{ 1065{
1067 const struct rx_status *status; 1066 const struct rx_status *status;
1068 1067
1069 *pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status)); 1068 *pstatus = status = (struct rx_status *)
1069 (buffer + (length - sizeof(struct rx_status)));
1070 if (status->frame_status & ZD_RX_ERROR) { 1070 if (status->frame_status & ZD_RX_ERROR) {
1071 struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); 1071 struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
1072 ieee->stats.rx_errors++; 1072 ieee->stats.rx_errors++;