diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-20 17:35:45 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-20 17:35:45 -0500 |
| commit | ec1eb529a087ddc749c5939e1954f9c4dd5daad8 (patch) | |
| tree | 9df556224431495ede8d4a92859b8bb0c060cf7c | |
| parent | 8bf4c09b99cccefb7502eb695f85c70f302b2cfe (diff) | |
| download | compat-wireless-2.6-old-ec1eb529a087ddc749c5939e1954f9c4dd5daad8.tar.gz | |
Updated compat.diff to reflect new updates on wireless-2.6
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | compat/compat.diff | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index f4f1e2b..3274e83 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -309,28 +309,6 @@ event.o mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o ---- a/net/mac80211/ieee80211.c 2008-01-08 16:32:22.000000000 -0500 -+++ b/net/mac80211/ieee80211.c 2008-01-08 16:32:22.000000000 -0500 -@@ -21,7 +21,9 @@ - #include <linux/wireless.h> - #include <linux/rtnetlink.h> - #include <linux/bitmap.h> -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - #include <net/net_namespace.h> -+#endif - #include <net/cfg80211.h> - - #include "ieee80211_i.h" -@@ -1093,7 +1095,9 @@ - mdev->open = ieee80211_master_open; - mdev->stop = ieee80211_master_stop; - mdev->type = ARPHRD_IEEE80211; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - mdev->header_ops = &ieee80211_header_ops; -+#endif - mdev->set_multicast_list = ieee80211_master_set_multicast_list; - - sdata->vif.type = IEEE80211_IF_TYPE_AP; --- a/drivers/ssb/scan.c 2008-01-08 17:59:08.000000000 -0500 +++ b/drivers/ssb/scan.c 2008-01-08 17:58:58.000000000 -0500 @@ -392,10 +392,18 @@ @@ -602,3 +580,25 @@ return 0; +--- a/net/mac80211/ieee80211.c 2008-01-20 17:33:12.000000000 -0500 ++++ b/net/mac80211/ieee80211.c 2008-01-20 17:33:12.000000000 -0500 +@@ -21,7 +21,9 @@ + #include <linux/wireless.h> + #include <linux/rtnetlink.h> + #include <linux/bitmap.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + #include <net/net_namespace.h> ++#endif + #include <net/cfg80211.h> + + #include "ieee80211_i.h" +@@ -1095,7 +1097,9 @@ + mdev->open = ieee80211_master_open; + mdev->stop = ieee80211_master_stop; + mdev->type = ARPHRD_IEEE80211; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + mdev->header_ops = &ieee80211_header_ops; ++#endif + mdev->set_multicast_list = ieee80211_master_set_multicast_list; + + sdata->vif.type = IEEE80211_IF_TYPE_AP; |