diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-07-09 09:02:49 -0700 |
---|---|---|
committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-07-09 09:02:49 -0700 |
commit | 2141af20cb7b943389127ee5fdc294859982e246 (patch) | |
tree | 2816226f70c4c4b0440ced3e8e2f8a52d93746c6 | |
parent | 9acac9dd9d5aa259b2fd25761d570aca61cb5f55 (diff) | |
download | compat-wireless-2.6-old-2141af20cb7b943389127ee5fdc294859982e246.tar.gz |
Update compat.diff
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
-rw-r--r-- | compat/compat.diff | 312 |
1 files changed, 156 insertions, 156 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index 98701a3..43b3800 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -101,17 +101,6 @@ -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o compat.o cfg80211-$(CONFIG_NL80211) += nl80211.o ---- a/net/wireless/nl80211.c 2008-06-11 13:10:36.000000000 -0700 -+++ b/net/wireless/nl80211.c 2008-06-11 13:10:37.000000000 -0700 -@@ -1065,7 +1065,7 @@ - return -ENODEV; - if (!(*vlan)->ieee80211_ptr) - return -EINVAL; -- if ((*vlan)->ieee80211_ptr->wiphy != &rdev->wiphy) -+ if (((struct wireless_dev *)(*vlan)->ieee80211_ptr)->wiphy != &rdev->wiphy) - return -EINVAL; - } - return 0; --- a/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-07 20:02:06.000000000 -0500 +++ b/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-07 20:02:07.000000000 -0500 @@ -1281,7 +1281,7 @@ @@ -660,15 +649,6 @@ return 0; ---- a/drivers/net/wireless/zd1211rw/zd_mac.c 2008-06-27 13:39:54.000000000 -0700 -+++ b/drivers/net/wireless/zd1211rw/zd_mac.c 2008-06-27 13:39:54.000000000 -0700 -@@ -974,5 +974,5 @@ - dev_dbg_f(zd_mac_dev(mac), "\n"); - cancel_rearming_delayed_workqueue(zd_workqueue, - &mac->housekeeping.link_led_work); -- zd_chip_control_leds(&mac->chip, LED_OFF); -+ zd_chip_control_leds(&mac->chip, LED_OFF_ZD); - } --- a/net/mac80211/ieee80211_i.h 2008-06-27 13:39:54.000000000 -0700 +++ b/net/mac80211/ieee80211_i.h 2008-06-27 13:39:54.000000000 -0700 @@ -407,6 +407,10 @@ @@ -816,64 +796,6 @@ } mutex_unlock(&rdev->devlist_mtx); break; ---- a/net/mac80211/rx.c 2008-07-01 02:59:06.000000000 -0700 -+++ b/net/mac80211/rx.c 2008-07-01 02:59:07.000000000 -0700 -@@ -305,8 +305,13 @@ - } - - prev_dev = sdata->dev; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) -+ sdata->stats.rx_packets++; -+ sdata->stats.rx_bytes += skb->len; -+#else - sdata->dev->stats.rx_packets++; - sdata->dev->stats.rx_bytes += skb->len; -+#endif - } - - if (prev_dev) { -@@ -1345,8 +1350,13 @@ - - skb->dev = dev; - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) -+ IEEE80211_DEV_TO_SUB_IF(dev)->stats.rx_packets++; -+ IEEE80211_DEV_TO_SUB_IF(dev)->stats.rx_bytes += skb->len; -+#else - dev->stats.rx_packets++; - dev->stats.rx_bytes += skb->len; -+#endif - - /* skip the wrapping header */ - eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr)); -@@ -1451,8 +1461,13 @@ - - rx->skb->dev = dev; - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) -+ rx->sdata->stats.rx_packets++; -+ rx->sdata->stats.rx_bytes += rx->skb->len; -+#else - dev->stats.rx_packets++; - dev->stats.rx_bytes += rx->skb->len; -+#endif - - ieee80211_deliver_skb(rx); - -@@ -1632,8 +1647,13 @@ - } - - prev_dev = sdata->dev; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) -+ sdata->stats.rx_packets++; -+ sdata->stats.rx_bytes += skb->len; -+#else - sdata->dev->stats.rx_packets++; - sdata->dev->stats.rx_bytes += skb->len; -+#endif - } - - if (prev_dev) { --- a/net/mac80211/tx.c 2008-07-01 02:59:06.000000000 -0700 +++ b/net/mac80211/tx.c 2008-07-01 02:59:07.000000000 -0700 @@ -18,12 +18,17 @@ @@ -1017,9 +939,147 @@ ieee80211_wake_queue(&local->hw, i); } } ---- a/include/net/mac80211.h 2008-07-06 23:07:14.000000000 -0700 -+++ b/include/net/mac80211.h 2008-07-06 23:07:17.000000000 -0700 -@@ -296,7 +296,11 @@ +--- a/net/mac80211/wme.c 2008-07-08 07:18:20.000000000 -0700 ++++ b/net/mac80211/wme.c 2008-07-08 07:18:23.000000000 -0700 +@@ -17,6 +17,9 @@ + #include <net/mac80211.h> + #include "ieee80211_i.h" + #include "wme.h" ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)) ++#include "mq_compat.h" ++#endif + + /* maximum number of hardware queues we support. */ + #define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES) +@@ -318,14 +321,22 @@ + + + /* called whenever parameters are updated on existing qdisc */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) ++static int wme_qdiscop_tune(struct Qdisc *qd, struct rtattr *opt) ++#else + static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt) ++#endif + { + return 0; + } + + + /* called during initial creation of qdisc on device */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) ++static int wme_qdiscop_init(struct Qdisc *qd, struct rtattr *opt) ++#else + static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) ++#endif + { + struct ieee80211_sched_data *q = qdisc_priv(qd); + struct net_device *dev = qd->dev; +@@ -446,7 +457,11 @@ + + + static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) ++ struct rtattr **tca, unsigned long *arg) ++#else + struct nlattr **tca, unsigned long *arg) ++#endif + { + unsigned long cl = *arg; + struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); +@@ -530,7 +545,11 @@ + + /* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached) + * - these are the operations on the classes */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) ++static struct Qdisc_class_ops class_ops = ++#else + static const struct Qdisc_class_ops class_ops = ++#endif + { + .graft = wme_classop_graft, + .leaf = wme_classop_leaf, +--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-07-09 05:07:17.000000000 -0700 ++++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-07-09 05:02:12.000000000 -0700 +@@ -141,7 +141,9 @@ + rt2x00dev->rfkill->data = rt2x00dev; + rt2x00dev->rfkill->state = -1; + rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + rt2x00dev->rfkill->get_state = rt2x00rfkill_get_state; ++#endif + + INIT_DELAYED_WORK(&rt2x00dev->rfkill_work, rt2x00rfkill_poll); + +--- a/drivers/net/wireless/zd1211rw/zd_mac.c 2008-07-09 08:54:35.000000000 -0700 ++++ b/drivers/net/wireless/zd1211rw/zd_mac.c 2008-07-09 08:54:36.000000000 -0700 +@@ -1002,5 +1002,5 @@ + dev_dbg_f(zd_mac_dev(mac), "\n"); + cancel_rearming_delayed_workqueue(zd_workqueue, + &mac->housekeeping.link_led_work); +- zd_chip_control_leds(&mac->chip, LED_OFF); ++ zd_chip_control_leds(&mac->chip, LED_OFF_ZD); + } +--- a/net/mac80211/rx.c 2008-07-09 08:54:34.000000000 -0700 ++++ b/net/mac80211/rx.c 2008-07-09 08:54:36.000000000 -0700 +@@ -305,8 +305,13 @@ + } + + prev_dev = sdata->dev; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ sdata->stats.rx_packets++; ++ sdata->stats.rx_bytes += skb->len; ++#else + sdata->dev->stats.rx_packets++; + sdata->dev->stats.rx_bytes += skb->len; ++#endif + } + + if (prev_dev) { +@@ -1342,8 +1347,13 @@ + + skb->dev = dev; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ IEEE80211_DEV_TO_SUB_IF(dev)->stats.rx_packets++; ++ IEEE80211_DEV_TO_SUB_IF(dev)->stats.rx_bytes += skb->len; ++#else + dev->stats.rx_packets++; + dev->stats.rx_bytes += skb->len; ++#endif + + /* skip the wrapping header */ + eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr)); +@@ -1448,8 +1458,13 @@ + + rx->skb->dev = dev; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ rx->sdata->stats.rx_packets++; ++ rx->sdata->stats.rx_bytes += rx->skb->len; ++#else + dev->stats.rx_packets++; + dev->stats.rx_bytes += rx->skb->len; ++#endif + + ieee80211_deliver_skb(rx); + +@@ -1629,8 +1644,13 @@ + } + + prev_dev = sdata->dev; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ sdata->stats.rx_packets++; ++ sdata->stats.rx_bytes += skb->len; ++#else + sdata->dev->stats.rx_packets++; + sdata->dev->stats.rx_bytes += skb->len; ++#endif + } + + if (prev_dev) { +--- a/include/net/mac80211.h 2008-07-09 08:54:33.000000000 -0700 ++++ b/include/net/mac80211.h 2008-07-09 08:54:36.000000000 -0700 +@@ -304,7 +304,11 @@ s8 tx_rate_idx; u8 antenna_sel_tx; @@ -1031,7 +1091,7 @@ union { struct { -@@ -326,6 +330,20 @@ +@@ -334,6 +338,20 @@ return (struct ieee80211_tx_info *)skb->cb; } @@ -1052,8 +1112,8 @@ /** * enum mac80211_rx_flags - receive flags ---- a/net/mac80211/main.c 2008-07-06 23:07:14.000000000 -0700 -+++ b/net/mac80211/main.c 2008-07-06 23:07:17.000000000 -0700 +--- a/net/mac80211/main.c 2008-07-09 08:54:34.000000000 -0700 ++++ b/net/mac80211/main.c 2008-07-09 08:54:36.000000000 -0700 @@ -21,7 +21,9 @@ #include <linux/wireless.h> #include <linux/rtnetlink.h> @@ -1064,7 +1124,7 @@ #include <net/cfg80211.h> #include "ieee80211_i.h" -@@ -982,6 +984,13 @@ +@@ -984,6 +986,13 @@ .cache_update = eth_header_cache_update, }; @@ -1078,7 +1138,7 @@ /* Must not be called for mdev */ void ieee80211_if_setup(struct net_device *dev) { -@@ -993,6 +1002,9 @@ +@@ -995,6 +1004,9 @@ dev->open = ieee80211_open; dev->stop = ieee80211_stop; dev->destructor = ieee80211_if_free; @@ -1101,74 +1161,14 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; ---- a/net/mac80211/wme.c 2008-07-08 07:18:20.000000000 -0700 -+++ b/net/mac80211/wme.c 2008-07-08 07:18:23.000000000 -0700 -@@ -17,6 +17,9 @@ - #include <net/mac80211.h> - #include "ieee80211_i.h" - #include "wme.h" -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)) -+#include "mq_compat.h" -+#endif - - /* maximum number of hardware queues we support. */ - #define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES) -@@ -318,14 +321,22 @@ - - - /* called whenever parameters are updated on existing qdisc */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) -+static int wme_qdiscop_tune(struct Qdisc *qd, struct rtattr *opt) -+#else - static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt) -+#endif - { +--- a/net/wireless/nl80211.c 2008-07-09 08:57:31.000000000 -0700 ++++ b/net/wireless/nl80211.c 2008-07-09 08:57:32.000000000 -0700 +@@ -1067,7 +1067,7 @@ + return -ENODEV; + if (!(*vlan)->ieee80211_ptr) + return -EINVAL; +- if ((*vlan)->ieee80211_ptr->wiphy != &rdev->wiphy) ++ if (((struct wireless_dev *)(*vlan)->ieee80211_ptr)->wiphy != &rdev->wiphy) + return -EINVAL; + } return 0; - } - - - /* called during initial creation of qdisc on device */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) -+static int wme_qdiscop_init(struct Qdisc *qd, struct rtattr *opt) -+#else - static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) -+#endif - { - struct ieee80211_sched_data *q = qdisc_priv(qd); - struct net_device *dev = qd->dev; -@@ -446,7 +457,11 @@ - - - static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) -+ struct rtattr **tca, unsigned long *arg) -+#else - struct nlattr **tca, unsigned long *arg) -+#endif - { - unsigned long cl = *arg; - struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); -@@ -530,7 +545,11 @@ - - /* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached) - * - these are the operations on the classes */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) -+static struct Qdisc_class_ops class_ops = -+#else - static const struct Qdisc_class_ops class_ops = -+#endif - { - .graft = wme_classop_graft, - .leaf = wme_classop_leaf, ---- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-07-09 05:07:17.000000000 -0700 -+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-07-09 05:02:12.000000000 -0700 -@@ -141,7 +141,9 @@ - rt2x00dev->rfkill->data = rt2x00dev; - rt2x00dev->rfkill->state = -1; - rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - rt2x00dev->rfkill->get_state = rt2x00rfkill_get_state; -+#endif - - INIT_DELAYED_WORK(&rt2x00dev->rfkill_work, rt2x00rfkill_poll); - |