priv->wireless_data.spy_data = &priv->ieee->spy_data;
net_dev->wireless_data = &priv->wireless_data;
net_dev->wireless_handlers = &ipw_wx_handler_def;
---- a/drivers/net/wireless/libertas/main.c 2009-10-07 01:42:20.000000000 -0400
-+++ b/drivers/net/wireless/libertas/main.c 2009-10-07 01:42:21.000000000 -0400
-@@ -1229,6 +1229,7 @@
+--- a/drivers/net/wireless/libertas/main.c 2009-11-02 08:04:43.000000000 -0800
++++ b/drivers/net/wireless/libertas/main.c 2009-11-02 08:04:44.000000000 -0800
+@@ -1109,6 +1109,7 @@
lbs_deb_leave(LBS_DEB_MAIN);
}
static const struct net_device_ops lbs_netdev_ops = {
.ndo_open = lbs_dev_open,
.ndo_stop = lbs_eth_stop,
-@@ -1239,6 +1240,7 @@
+@@ -1119,6 +1120,7 @@
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};
/**
* @brief This function adds the card. it will probe the
-@@ -1284,7 +1286,16 @@
+@@ -1164,7 +1166,16 @@
wdev->netdev = dev;
priv->dev = dev;
dev->watchdog_timeo = 5 * HZ;
dev->ethtool_ops = &lbs_ethtool_ops;
#ifdef WIRELESS_EXT
-@@ -1531,6 +1542,7 @@
+@@ -1405,6 +1416,7 @@
EXPORT_SYMBOL_GPL(lbs_stop_card);
static const struct net_device_ops mesh_netdev_ops = {
.ndo_open = lbs_dev_open,
.ndo_stop = lbs_mesh_stop,
-@@ -1538,6 +1550,7 @@
+@@ -1412,6 +1424,7 @@
.ndo_set_mac_address = lbs_set_mac_address,
.ndo_set_multicast_list = lbs_set_multicast_list,
};
/**
* @brief This function adds mshX interface
-@@ -1561,7 +1574,15 @@
+@@ -1435,7 +1448,15 @@
mesh_dev->ml_priv = priv;
priv->mesh_dev = mesh_dev;
mesh_dev->ethtool_ops = &lbs_ethtool_ops;
memcpy(mesh_dev->dev_addr, priv->dev->dev_addr,
sizeof(priv->dev->dev_addr));
-@@ -1777,11 +1798,13 @@
+@@ -1589,11 +1610,13 @@
lbs_deb_leave(LBS_DEB_MAIN);
}
static int lbs_add_rtap(struct lbs_private *priv)
{
-@@ -1802,7 +1825,13 @@
+@@ -1614,7 +1637,13 @@
memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);
rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;
#include <linux/workqueue.h>
#include <net/genetlink.h>
#include <net/cfg80211.h>
---- a/drivers/net/wireless/ath/ath9k/hw.c 2009-10-06 12:55:01.000000000 -0400
-+++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-10-06 12:55:02.000000000 -0400
-@@ -3675,7 +3675,7 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:38.000000000 -0800
++++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:39.000000000 -0800
+@@ -3254,7 +3254,7 @@
pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-10-06 12:57:49.000000000 -0400
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-10-06 12:57:50.000000000 -0400
-@@ -3239,10 +3239,10 @@
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-02 08:07:33.000000000 -0800
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-02 08:07:33.000000000 -0800
+@@ -3323,10 +3323,10 @@
/* Hardware specific file defines the PCI IDs table for that hardware module */
static struct pci_device_id iwl_hw_card_ids[] = {
We only do this for kernels <= 2.6.32 as 2.6.33 will use
the struct wiphy wireless handler.
---- a/net/wireless/core.c 2009-10-06 13:23:34.000000000 -0400
-+++ b/net/wireless/core.c 2009-10-06 13:25:31.000000000 -0400
-@@ -672,6 +672,10 @@
+--- a/net/wireless/core.c 2009-11-02 08:08:20.000000000 -0800
++++ b/net/wireless/core.c 2009-11-02 08:08:21.000000000 -0800
+@@ -671,6 +671,10 @@
wdev->sme_state = CFG80211_SME_IDLE;
mutex_unlock(&rdev->devlist_mtx);
#ifdef CONFIG_CFG80211_WEXT
In kernel < 2.6.32 libipw also exports ieee80211_rx.
To avoid conflicts with the other export we rename our.
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 5c385e3..26e5fc9 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2545,7 +2545,12 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
+--- a/net/mac80211/rx.c 2009-11-02 08:08:54.000000000 -0800
++++ b/net/mac80211/rx.c 2009-11-02 08:08:55.000000000 -0800
+@@ -2536,7 +2536,12 @@
drop:
kfree_skb(skb);
}