diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-02-06 14:30:31 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-02-06 14:30:31 -0500 |
| commit | 6770885da41ebdbf4aba0f291e5583bac1b220a7 (patch) | |
| tree | d3b4beb4168c1e512bfb19c3ef515c1242c412e2 | |
| parent | 7a8d1fe8dc582ef08a10f78853a0b3addee9fed5 (diff) | |
| download | compat-wireless-2.6-old-6770885da41ebdbf4aba0f291e5583bac1b220a7.tar.gz | |
Update compat.diff to reflect new changes
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 1b614cd..da06755 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -554,28 +554,6 @@ ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG ---- a/net/mac80211/ieee80211.c 2008-01-30 03:51:28.000000000 -0500 -+++ b/net/mac80211/ieee80211.c 2008-01-30 03:51:28.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" -@@ -1423,7 +1425,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/net/wireless/Makefile 2008-01-30 03:51:28.000000000 -0500 +++ b/drivers/net/wireless/Makefile 2008-01-30 03:54:03.000000000 -0500 @@ -6,49 +6,12 @@ @@ -628,3 +606,25 @@ obj-$(CONFIG_LIBERTAS) += libertas/ rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o +--- a/net/mac80211/ieee80211.c 2008-02-06 14:28:58.000000000 -0500 ++++ b/net/mac80211/ieee80211.c 2008-02-06 14:28:58.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" +@@ -1455,7 +1457,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; |