diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-03 14:40:37 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-03 14:40:37 -0500 |
| commit | e9e0174e4a34df44c1bd9778db7cd68c37ca393b (patch) | |
| tree | bdc8b29e9d1f1830428a96529e34a43d54562d25 | |
| parent | 90f18c398bec9c0ce6130ffee6d13a68084598da (diff) | |
| download | compat-wireless-2.6-old-e9e0174e4a34df44c1bd9778db7cd68c37ca393b.tar.gz | |
Fixed config.mk for new rate algorithms, updated compat.diff
Note: ath5k has a bug upstream which will be fixed soon
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | compat/compat.diff | 18 | ||||
| -rw-r--r-- | config.mk | 16 |
2 files changed, 15 insertions, 19 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index cd50df7..a45384a 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -237,16 +237,6 @@ .get_ethtool_stats = lbs_ethtool_get_stats, .get_strings = lbs_ethtool_get_strings, .get_wol = lbs_ethtool_get_wol, ---- a/net/mac80211/Makefile 2007-12-20 14:42:53.000000000 -0500 -+++ b/net/mac80211/Makefile 2007-12-20 14:42:54.000000000 -0500 -@@ -27,6 +27,7 @@ - key.o \ - util.o \ - event.o \ -+ compat.o \ - $(mac80211-objs-y) - - ifneq ($(CONFIG_MAC80211_RC_PID),y) --- a/net/mac80211/cfg.c 2007-12-20 14:42:53.000000000 -0500 +++ b/net/mac80211/cfg.c 2007-12-20 14:48:07.000000000 -0500 @@ -9,7 +9,9 @@ @@ -581,3 +571,11 @@ 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 @@ + key.o \ + util.o \ + event.o \ ++ compat.o \ + $(mac80211-objs-y) @@ -17,19 +17,17 @@ CONFIG_MAC80211_RC_DEFAULT=pid ifeq ($(CONFIG_MAC80211_RC_DEFAULT),pid) COPTS+= -DCONFIG_MAC80211_RC_DEFAULT=\"pid\" -endif - -ifeq ($(CONFIG_MAC80211_RC_DEFAULT_PID),y) CONFIG_MAC80211_RC_DEFAULT_PID=y +COPTS+= -DCONFIG_MAC80211_RC_DEFAULT_PID=1 +else +COPTS+= -DCONFIG_MAC80211_RC_DEFAULT=\"simple\" +CONFIG_MAC80211_RC_SIMPLE=y +COPTS+= -DCONFIG_MAC80211_RC_SIMPLE=1 endif -ifeq ($(CONFIG_MAC80211_RC_PID),y) CONFIG_MAC80211_RC_PID=y -endif - -CONFIG_MAC80211_RCSIMPLE=y -ifeq ($(CONFIG_MAC80211_RCSIMPLE),y) -COPTS+= -DCONFIG_MAC80211_RCSIMPLE=1 +ifeq ($(CONFIG_MAC80211_RC_PID),y) +COPTS+= -DCONFIG_MAC80211_RC_PID=1 endif CONFIG_CFG80211=m |