diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-08 15:55:33 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-08 15:55:33 -0500 |
| commit | f9547bb84b9cb0b51beaf7c0edac03ef19b96c84 (patch) | |
| tree | c3c59f4602b7e1a0e4891bb97332bdd487793667 | |
| parent | e9e0174e4a34df44c1bd9778db7cd68c37ca393b (diff) | |
| download | compat-wireless-2.6-old-f9547bb84b9cb0b51beaf7c0edac03ef19b96c84.tar.gz | |
* Updated compat.diff to reflect changes on wireless-2.6 everything
* Switching to using simple rate algorithm over pid as pid still
has some usability issues with some drivers.
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | compat/compat.diff | 18 | ||||
| -rw-r--r-- | config.mk | 2 |
3 files changed, 12 insertions, 10 deletions
@@ -29,7 +29,7 @@ modules: $(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules clean: - @if [ -d net ]; then \ + @if [ -d net -a -d $(KLIB_BUILD) ]; then \ $(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean ;\ fi @rm -f *.symvers diff --git a/compat/compat.diff b/compat/compat.diff index a45384a..d795bb7 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -549,8 +549,8 @@ 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 2007-12-20 14:42:53.000000000 -0500 -+++ b/net/mac80211/ieee80211.c 2007-12-20 14:42:54.000000000 -0500 +--- a/net/mac80211/ieee80211.c 2008-01-08 14:50:01.000000000 -0500 ++++ b/net/mac80211/ieee80211.c 2008-01-08 14:50:02.000000000 -0500 @@ -21,7 +21,9 @@ #include <linux/wireless.h> #include <linux/rtnetlink.h> @@ -561,7 +561,7 @@ #include <net/cfg80211.h> #include "ieee80211_i.h" -@@ -1076,7 +1078,9 @@ +@@ -1088,7 +1090,9 @@ mdev->open = ieee80211_master_open; mdev->stop = ieee80211_master_stop; mdev->type = ARPHRD_IEEE80211; @@ -571,11 +571,13 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; ---- a/net/mac80211/Makefile.orig 2008-01-02 17:03:50.000000000 -0500 -+++ b/net/mac80211/Makefile 2008-01-02 17:03:50.000000000 -0500 -@@ -32,4 +32,5 @@ +--- a/net/mac80211/Makefile 2008-01-08 15:41:04.000000000 -0500 ++++ b/net/mac80211/Makefile 2008-01-08 15:42:10.000000000 -0500 +@@ -27,6 +27,7 @@ + tx.o \ key.o \ util.o \ - event.o \ + compat.o \ - $(mac80211-objs-y) + event.o + + mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o @@ -13,7 +13,7 @@ ifeq ($(CONFIG_MAC80211),m) COPTS+= -DCONFIG_MAC80211=1 endif -CONFIG_MAC80211_RC_DEFAULT=pid +CONFIG_MAC80211_RC_DEFAULT=simple ifeq ($(CONFIG_MAC80211_RC_DEFAULT),pid) COPTS+= -DCONFIG_MAC80211_RC_DEFAULT=\"pid\" |