Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 937a049d authored by Ulrich Kunitz's avatar Ulrich Kunitz Committed by David S. Miller
Browse files

[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: default avatarUlrich Kunitz <kune@deine-taler.de>
Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09703f5e

drivers/net/wireless/zd1211rw/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ zd1211rw-objs := zd_chip.o zd_ieee80211.o \ 
		zd_mac.o zd_netdev.o \

		zd_mac.o zd_netdev.o \

		zd_rf_al2230.o zd_rf_rf2959.o \

		zd_rf_al2230.o zd_rf_rf2959.o \

		zd_rf_al7230b.o zd_rf_uw2453.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)

ifeq ($(CONFIG_ZD1211RW_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

EXTRA_CFLAGS += -DDEBUG

drivers/net/wireless/zd1211rw/zd_chip.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "zd_ieee80211.h"

#include "zd_ieee80211.h"

#include "zd_mac.h"

#include "zd_mac.h"

#include "zd_rf.h"

#include "zd_rf.h"

#include "zd_util.h"





void zd_chip_init(struct zd_chip *chip,

void zd_chip_init(struct zd_chip *chip,

	         struct net_device *netdev,

	         struct net_device *netdev,

drivers/net/wireless/zd1211rw/zd_mac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "zd_ieee80211.h"

#include "zd_ieee80211.h"

#include "zd_netdev.h"

#include "zd_netdev.h"

#include "zd_rf.h"

#include "zd_rf.h"

#include "zd_util.h"





static void ieee_init(struct ieee80211_device *ieee);

static void ieee_init(struct ieee80211_device *ieee);

static void softmac_init(struct ieee80211softmac_device *sm);

static void softmac_init(struct ieee80211softmac_device *sm);
@@ -1066,7 +1065,8 @@ static int fill_rx_stats(struct ieee80211_rx_stats *stats, 
{

{

	const struct rx_status *status;

	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) {

	if (status->frame_status & ZD_RX_ERROR) {

		struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);

		struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);

		ieee->stats.rx_errors++;

		ieee->stats.rx_errors++;

drivers/net/wireless/zd1211rw/zd_usb.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "zd_netdev.h"

#include "zd_netdev.h"

#include "zd_mac.h"

#include "zd_mac.h"

#include "zd_usb.h"

#include "zd_usb.h"

#include "zd_util.h"





static struct usb_device_id usb_ids[] = {

static struct usb_device_id usb_ids[] = {

	/* ZD1211 */

	/* ZD1211 */

drivers/net/wireless/zd1211rw/zd_util.c

deleted100644 → 0
+0 −82
Original line number Original line Diff line number Diff line 
/* zd_util.c

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 * Utility program

 */



#include "zd_def.h"

#include "zd_util.h"



#ifdef DEBUG

static char hex(u8 v)

{

	v &= 0xf;

	return (v < 10 ? '0' : 'a' - 10) + v;

}



static char hex_print(u8 c)

{

	return (0x20 <= c && c < 0x7f) ? c : '.';

}



static void dump_line(const u8 *bytes, size_t size)

{

	char c;

	size_t i;



	size = size <= 8 ? size : 8;

	printk(KERN_DEBUG "zd1211 %p ", bytes);

	for (i = 0; i < 8; i++) {

		switch (i) {

		case 1:

		case 5:

			c = '.';

			break;

		case 3:

			c = ':';

			break;

		default:

			c = ' ';

		}

		if (i < size) {

			printk("%c%c%c", hex(bytes[i] >> 4), hex(bytes[i]), c);

		} else {

			printk("  %c", c);

		}

	}



	for (i = 0; i < size; i++)

		printk("%c", hex_print(bytes[i]));

	printk("\n");

}



void zd_hexdump(const void *bytes, size_t size)

{

	size_t i = 0;



	do {

		dump_line((u8 *)bytes + i, size-i);

		i += 8;

	} while (i < size);

}

#endif /* DEBUG */



void *zd_tail(const void *buffer, size_t buffer_size, size_t tail_size)

{

	if (buffer_size < tail_size)

		return NULL;

	return (u8 *)buffer + (buffer_size - tail_size);

}