Adds CONFIG_IWLCORE, CONFIG_SSB_SPROM, removes CONFIG_MAC80211_RC_SIMPLE,

CONFIG_BCM43XX is gone! Add changes required to compat.diff from latest pull.

Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>

2 files changed, 41 insertions, 51 deletions

diff --git a/compat/compat.diff b/compat/compat.diff
index 826eebc..c95ad26 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -109,13 +109,6 @@
  
  #include "ieee80211_i.h"
  #include "ieee80211_rate.h"
---- a/net/ieee80211/Makefile	2008-02-28 19:54:52.000000000 +0100
-+++ b/net/ieee80211/Makefile	2008-02-28 19:54:53.000000000 +0100
-@@ -10,4 +10,3 @@ ieee80211-objs := \
- 	ieee80211_wx.o \
- 	ieee80211_geo.o
- 
--obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
 --- a/net/ieee80211/ieee80211_module.c	2008-02-28 19:54:52.000000000 +0100
 +++ b/net/ieee80211/ieee80211_module.c	2008-02-28 19:54:53.000000000 +0100
 @@ -47,7 +47,9 @@
@@ -260,7 +253,7 @@
  EXTRA_CFLAGS += -DDEBUG
 --- a/drivers/net/wireless/Makefile	2008-03-11 19:54:52.000000000 +0100
 +++ b/drivers/net/wireless/Makefile	2008-03-11 19:54:53.000000000 +0100
-@@ -6,49 +6,13 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
+@@ -6,48 +6,13 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
  
  obj-$(CONFIG_IPW2200) += ipw2200.o
  
@@ -295,7 +288,6 @@
 -obj-$(CONFIG_PRISM54)		+= prism54/
 -
 -obj-$(CONFIG_HOSTAP)		+= hostap/
--obj-$(CONFIG_BCM43XX)		+= bcm43xx/
  obj-$(CONFIG_B43)		+= b43/
  obj-$(CONFIG_B43LEGACY)		+= b43legacy/
  obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
@@ -785,9 +777,40 @@
  			return -EINVAL;
  	}
  	return 0;
---- a/drivers/ssb/main.c	2008-03-07 20:02:05.000000000 -0500
-+++ b/drivers/ssb/main.c	2008-03-07 20:02:07.000000000 -0500
-@@ -341,6 +341,27 @@
+--- a/drivers/net/wireless/zd1211rw/zd_mac.c	2008-03-07 20:02:06.000000000 -0500
++++ b/drivers/net/wireless/zd1211rw/zd_mac.c	2008-03-07 20:02:07.000000000 -0500
+@@ -1042,5 +1042,5 @@
+ 	dev_dbg_f(zd_mac_dev(mac), "\n");
+ 	cancel_rearming_delayed_workqueue(zd_workqueue,
+ 		&mac->housekeeping.link_led_work);
+-	zd_chip_control_leds(&mac->chip, LED_OFF);
++	zd_chip_control_leds(&mac->chip, LED_OFF_ZD);
+ }
+--- a/drivers/net/wireless/zd1211rw/zd_chip.c	2008-03-07 20:02:06.000000000 -0500
++++ b/drivers/net/wireless/zd1211rw/zd_chip.c	2008-03-07 20:02:07.000000000 -0500
+@@ -1281,7 +1281,7 @@
+ 	other_led = chip->link_led == LED1 ? LED2 : LED1;
+ 
+ 	switch (status) {
+-	case LED_OFF:
++	case LED_OFF_ZD:
+ 		ioreqs[0].value = FW_LINK_OFF;
+ 		ioreqs[1].value = v[1] & ~(LED1|LED2);
+ 		break;
+--- a/drivers/net/wireless/zd1211rw/zd_chip.h	2008-03-07 20:02:06.000000000 -0500
++++ b/drivers/net/wireless/zd1211rw/zd_chip.h	2008-03-07 20:02:07.000000000 -0500
+@@ -897,7 +897,7 @@
+ int zd_chip_unlock_phy_regs(struct zd_chip *chip);
+ 
+ enum led_status {
+-	LED_OFF = 0,
++	LED_OFF_ZD = 0,
+ 	LED_SCANNING = 1,
+ 	LED_ASSOCIATED = 2,
+ };
+--- a/drivers/ssb/main.c	2008-03-14 10:30:04.000000000 -0400
++++ b/drivers/ssb/main.c	2008-03-14 10:30:05.000000000 -0400
+@@ -360,6 +360,27 @@
  	return 0;
  }
  
@@ -815,7 +838,7 @@
  static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
  {
  	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-@@ -353,6 +374,7 @@
+@@ -372,6 +393,7 @@
  			     ssb_dev->id.vendor, ssb_dev->id.coreid,
  			     ssb_dev->id.revision);
  }
@@ -823,39 +846,8 @@
  
  static struct bus_type ssb_bustype = {
  	.name		= "ssb",
---- a/drivers/net/wireless/zd1211rw/zd_mac.c	2008-03-07 20:02:06.000000000 -0500
-+++ b/drivers/net/wireless/zd1211rw/zd_mac.c	2008-03-07 20:02:07.000000000 -0500
-@@ -1042,5 +1042,5 @@
- 	dev_dbg_f(zd_mac_dev(mac), "\n");
- 	cancel_rearming_delayed_workqueue(zd_workqueue,
- 		&mac->housekeeping.link_led_work);
--	zd_chip_control_leds(&mac->chip, LED_OFF);
-+	zd_chip_control_leds(&mac->chip, LED_OFF_ZD);
- }
---- a/drivers/net/wireless/zd1211rw/zd_chip.c	2008-03-07 20:02:06.000000000 -0500
-+++ b/drivers/net/wireless/zd1211rw/zd_chip.c	2008-03-07 20:02:07.000000000 -0500
-@@ -1281,7 +1281,7 @@
- 	other_led = chip->link_led == LED1 ? LED2 : LED1;
- 
- 	switch (status) {
--	case LED_OFF:
-+	case LED_OFF_ZD:
- 		ioreqs[0].value = FW_LINK_OFF;
- 		ioreqs[1].value = v[1] & ~(LED1|LED2);
- 		break;
---- a/drivers/net/wireless/zd1211rw/zd_chip.h	2008-03-07 20:02:06.000000000 -0500
-+++ b/drivers/net/wireless/zd1211rw/zd_chip.h	2008-03-07 20:02:07.000000000 -0500
-@@ -897,7 +897,7 @@
- int zd_chip_unlock_phy_regs(struct zd_chip *chip);
- 
- enum led_status {
--	LED_OFF = 0,
-+	LED_OFF_ZD = 0,
- 	LED_SCANNING = 1,
- 	LED_ASSOCIATED = 2,
- };
---- a/drivers/net/wireless/ath5k/hw.c	2008-03-07 20:16:26.000000000 -0500
-+++ b/drivers/net/wireless/ath5k/hw.c	2008-03-07 20:16:26.000000000 -0500
+--- a/drivers/net/wireless/ath5k/hw.c	2008-03-14 10:32:35.000000000 -0400
++++ b/drivers/net/wireless/ath5k/hw.c	2008-03-14 10:32:36.000000000 -0400
 @@ -385,7 +385,11 @@
  	/* reseting PCI on PCI-E cards results card to hang
  	 * and always return 0xffff... so we ingore that flag
@@ -868,7 +860,7 @@
  
  	/* Reset chipset */
  	ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
-@@ -935,7 +939,11 @@
+@@ -937,7 +941,11 @@
  	 * TODO: Check out tx triger level, it's always 64 on dumps but I
  	 * guess we can tweak it and see how it goes ;-)
  	 */
diff --git a/config.mk b/config.mk
index f442708..69541c3 100644
--- a/config.mk
+++ b/config.mk
@@ -18,10 +18,6 @@ CONFIG_MAC80211=m
 
 CONFIG_MAC80211_RC_DEFAULT=pid
 CONFIG_MAC80211_RC_PID=y
-# Comment above and uncomment below if you are having issues with
-# the rate pid control algorithm.
-#CONFIG_MAC80211_RC_DEFAULT=simple
-#CONFIG_MAC80211_RC_SIMPLE=y
 
 # enable mesh networking too
 CONFIG_MAC80211_MESH=y
@@ -34,6 +30,7 @@ ifneq ($(CONFIG_PCI),)
 
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=n
+CONFIG_IWLCORE=m
 CONFIG_IWL3945=m
 CONFIG_IWL4965=m
 CONFIG_B43=m
@@ -167,6 +164,7 @@ CONFIG_P54_COMMON=m
 # Sonics Silicon Backplane
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
 
 ifneq ($(CONFIG_PCMCIA),)
 CONFIG_SSB_PCMCIAHOST=y