Skip to content

Commit

Permalink
[ZD1211RW]: Removed zd_util.c and zd_util.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ulrich Kunitz authored and David S. Miller committed Oct 10, 2007
1 parent 09703f5 commit 937a049
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 116 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/zd1211rw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ zd1211rw-objs := zd_chip.o zd_ieee80211.o \
zd_mac.o zd_netdev.o \
zd_rf_al2230.o zd_rf_rf2959.o \
zd_rf_al7230b.o zd_rf_uw2453.o \
zd_rf.o zd_usb.o zd_util.o
zd_rf.o zd_usb.o

ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/zd1211rw/zd_chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "zd_ieee80211.h"
#include "zd_mac.h"
#include "zd_rf.h"
#include "zd_util.h"

void zd_chip_init(struct zd_chip *chip,
struct net_device *netdev,
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/zd1211rw/zd_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "zd_ieee80211.h"
#include "zd_netdev.h"
#include "zd_rf.h"
#include "zd_util.h"

static void ieee_init(struct ieee80211_device *ieee);
static void softmac_init(struct ieee80211softmac_device *sm);
Expand Down Expand Up @@ -1066,7 +1065,8 @@ static int fill_rx_stats(struct ieee80211_rx_stats *stats,
{
const struct rx_status *status;

*pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));
*pstatus = status = (struct rx_status *)
(buffer + (length - sizeof(struct rx_status)));
if (status->frame_status & ZD_RX_ERROR) {
struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
ieee->stats.rx_errors++;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/zd1211rw/zd_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "zd_netdev.h"
#include "zd_mac.h"
#include "zd_usb.h"
#include "zd_util.h"

static struct usb_device_id usb_ids[] = {
/* ZD1211 */
Expand Down
82 changes: 0 additions & 82 deletions drivers/net/wireless/zd1211rw/zd_util.c

This file was deleted.

29 changes: 0 additions & 29 deletions drivers/net/wireless/zd1211rw/zd_util.h

This file was deleted.

0 comments on commit 937a049

Please sign in to comment.