--- a/acx-mac80211.mod.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
- .init = init_module,
-#ifdef CONFIG_MODULE_UNLOAD
- .exit = cleanup_module,
-#endif
-};
-
-static const char __module_depends[]
-__attribute_used__
-__attribute__((section(".modinfo"))) =
-"depends=";
-
-MODULE_ALIAS("pci:v0000104Cd00008400sv*sd*bc*sc*i*");
-MODULE_ALIAS("pci:v0000104Cd00008401sv*sd*bc*sc*i*");
-MODULE_ALIAS("pci:v0000104Cd00009066sv*sd*bc*sc*i*");

--- a/acx.h
+++ b/acx.h
@@ -1,8 +1,6 @@
 #include <net/mac80211.h>
 #include <net/ieee80211.h>
 #include "acx_config.h"
-#include "wlan_hdr.h"
-#include "wlan_mgmt.h"
 #include "acx_mac80211.h"
 #include "acx_struct.h"
 #include "acx_func.h"

--- a/acx_func.h
+++ b/acx_func.h
@@ -334,7 +334,7 @@ acx_stop_queue(struct ieee80211_hw *hw, const char *msg)
 acx_queue_stopped(struct ieee80211_hw *ieee)
 {
 	return netif_queue_stopped(ieee);
-}*/
+}
 
 
 static inline void
@@ -369,6 +369,7 @@ acx_carrier_on(struct net_device *ndev, const char *msg)
 		log(L_BUFT, "tx: carrier on %s\n", msg);
 }
 
+*/
 
 
 /***********************************************************************
@@ -429,7 +430,7 @@ void acx_s_cmd_start_scan(acx_device_t *adev);
 /***********************************************************************
 ** Ioctls
 */
-int
+/*int
 acx111pci_ioctl_info(
 	struct net_device *ndev,
 	struct iw_request_info *info,
@@ -441,7 +442,7 @@ acx100pci_ioctl_set_phy_amp_bias(
 	struct iw_request_info *info,
 	struct iw_param *vwrq,
 	char *extra);
-
+*/
 
 /***********************************************************************
 ** /proc
@@ -451,9 +452,9 @@ int acx_proc_register_entries(struct ieee80211_hw *ieee);
 int acx_proc_unregister_entries(struct ieee80211_hw *ieee);
 #else
 static inline int
-acx_proc_register_entries(const struct net_device *ndev) { return OK; }
+acx_proc_register_entries(const struct ieee80211_hw *ieee) { return OK; }
 static inline int
-acx_proc_unregister_entries(const struct net_device *ndev) { return OK; }
+acx_proc_unregister_entries(const struct ieee80211_hw *ieee) { return OK; }
 #endif
 
 
@@ -623,6 +624,9 @@ int acx_net_conf_tx(struct ieee80211_hw* ieee, int queue,
 //static void acx_netdev_init(struct net_device *ndev);
 int acxpci_s_reset_dev(acx_device_t *adev);
 void acx_e_after_interrupt_task(struct work_struct* work);
+void acx_i_set_multicast_list(struct ieee80211_hw *hw,
+                            unsigned short netflags, int mc_count);
+
 /*** End DeviceScape Functions **/
 
 void great_inquisitor(acx_device_t *adev);

--- a/acx_mac80211.h
+++ b/acx_mac80211.h
@@ -49,10 +49,6 @@ struct acx_interface {
                        __FUNCTION__, __FILE__, __LINE__);                               \
         } while (0)     
 
-#define ACX_MACFMT                "%02x:%02x:%02x:%02x:%02x:%02x"
-#define ACX_MACARG(x)       ((u8*)(x))[0], ((u8*)(x))[1], \
-                                ((u8*)(x))[2], ((u8*)(x))[3], \
-                                ((u8*)(x))[4], ((u8*)(x))[5]
 
 
 #define ACX_MODE_NOTADHOC 0xFFFF

--- a/acx_struct.h
+++ b/acx_struct.h
@@ -536,7 +536,7 @@ typedef struct rxbuffer {
 **	phy_hdr_t phy			*/
 	struct ieee80211_hdr hdr_a3;
 	/* maximally sized data part of wlan packet */
-	u8	data_a3[WLAN_A4FR_MAXLEN_WEP_FCS - WLAN_HDR_A3_LEN];
+	u8	data_a3[30 + 2312 + 4 - 24]; /*WLAN_A4FR_MAXLEN_WEP_FCS - WLAN_HDR_A3_LEN]*/
 	/* can add hdr/data_a4 if needed */
 } ACX_PACKED rxbuffer_t;
 
@@ -728,7 +728,7 @@ struct client {
 	u8	stepup_count;
 	char	essid[IW_ESSID_MAX_SIZE + 1];	/* ESSID and trailing '\0'  */
 /* FIXME: this one is too damn big */
-	char	challenge_text[WLAN_CHALLENGE_LEN];
+	char	challenge_text[128]; /*WLAN_CHALLENGE_LEN*/
 };
 
 
@@ -1026,7 +1026,7 @@ typedef struct usb_txbuffer {
 	u8	ctrl2;
 	u16	data_len;
 	/* wlan packet content is placed here: */
-	u8	data[WLAN_A4FR_MAXLEN_WEP_FCS];
+	u8	data[30 + 2312 + 4]; /*WLAN_A4FR_MAXLEN_WEP_FCS]*/
 } ACX_PACKED usb_txbuffer_t;
 
 /* USB returns either rx packets (see rxbuffer) or
@@ -1191,11 +1191,12 @@ struct acx_device {
 	struct net_device_stats	stats;		/* net device statistics */
 
 #ifdef WIRELESS_EXT
-	struct iw_statistics	wstats;		/* wireless statistics */
+//	struct iw_statistics	wstats;		/* wireless statistics */
 #endif
 	struct acx_stats	acx_stats;
 	struct ieee80211_hw	*ieee;
 	struct ieee80211_hw_mode	*modes;
+	struct ieee80211_rx_status rx_status;
 	/*** Power managment ***/
 	struct pm_dev		*pm;		/* PM crap */
 
@@ -1259,7 +1260,7 @@ struct acx_device {
 	u16		scan_duration;
 	u16		scan_probe_delay;
 #if WIRELESS_EXT > 15
-	struct iw_spy_data	spy_data;	/* FIXME: needs to be implemented! */
+//	struct iw_spy_data	spy_data;	/* FIXME: needs to be implemented! */
 #endif
 
 	/*** Virtual interface struct ***/
@@ -1293,6 +1294,9 @@ struct acx_device {
 	u16		scan_retries;
 	unsigned long	scan_start;		/* YES, jiffies is defined as "unsigned long" */
 
+
+	/* MAC80211 Template Reference */
+	struct sk_buff *beacon_cache;
 	/* stations known to us (if we're an ap) */
 //	client_t	sta_list[32];		/* tab is larger than list, so that */
 //	client_t	*sta_hash_tab[64];	/* hash collisions are not likely */