diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2007-11-30 00:31:16 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2007-11-30 00:31:16 -0500 |
| commit | c8c2995e8f5182edf4804e602d3c4a525c4e32c9 (patch) | |
| tree | bd5a96ba2f47308ca5f3d348adfe08f0c37e1825 | |
| parent | ff8be4b95289e15d03bd1db4604210616d3c179d (diff) | |
| download | compat-wireless-2.6-old-c8c2995e8f5182edf4804e602d3c4a525c4e32c9.tar.gz | |
Updates compat/compat.diff to apply cleanly for v2.6.24-rc1-1686-g7117356
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | compat/compat.diff | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index 5f645bf..96becbf 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -481,38 +481,6 @@ #include <net/cfg80211.h> #include <net/rtnetlink.h> ---- a/net/mac80211/ieee80211.c 2007-11-27 18:14:16.000000000 -0500 -+++ b/net/mac80211/ieee80211.c 2007-11-27 18:14:16.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" -@@ -423,7 +425,9 @@ - void ieee80211_if_setup(struct net_device *dev) - { - ether_setup(dev); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - dev->header_ops = &ieee80211_header_ops; -+#endif - dev->hard_start_xmit = ieee80211_subif_start_xmit; - dev->wireless_handlers = &ieee80211_iw_handler_def; - dev->set_multicast_list = ieee80211_set_multicast_list; -@@ -1010,7 +1014,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->type = IEEE80211_IF_TYPE_AP; --- a/net/ieee80211/Makefile 2007-11-27 20:00:21.000000000 -0500 +++ b/net/ieee80211/Makefile 2007-11-27 19:58:36.000000000 -0500 @@ -10,4 +10,3 @@ @@ -583,3 +551,35 @@ obj-$(CONFIG_LIBERTAS) += libertas/ rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o +--- a/net/mac80211/ieee80211.c 2007-11-30 00:29:10.000000000 -0500 ++++ b/net/mac80211/ieee80211.c 2007-11-30 00:29:24.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" +@@ -427,7 +429,9 @@ + void ieee80211_if_setup(struct net_device *dev) + { + ether_setup(dev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + dev->header_ops = &ieee80211_header_ops; ++#endif + dev->hard_start_xmit = ieee80211_subif_start_xmit; + dev->wireless_handlers = &ieee80211_iw_handler_def; + dev->set_multicast_list = ieee80211_set_multicast_list; +@@ -1014,7 +1018,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->type = IEEE80211_IF_TYPE_AP; |