Tue Jan 10 01:46:06 UTC 2006

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24751

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-hvc-console.patch 
	linux-2.6-softmac-git.patch sources 
Added Files:
	linux-2.6.15-spufs-compile.patch 
Removed Files:
	linux-2.6-cell-idle-pmgt.patch linux-2.6-cell-iommu.patch 
	linux-2.6-cell-no-legacy-io.patch 
	linux-2.6-cell-nvram-kmalloc.patch 
	linux-2.6-cell-platform-detect.patch 
	linux-2.6-serial-nrports.patch linux-2.6-serial-of.patch 
	linux-2.6.15-rc1-ppc64-syscallpath.patch 
Log Message:
PowerPC update from git tree

linux-2.6.15-spufs-compile.patch:
 inode.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6.15-spufs-compile.patch ---
--- linux-2.6.15/arch/powerpc/platforms/cell/spufs/inode.c~	2006-01-10 01:00:29.000000000 +0000
+++ linux-2.6.15/arch/powerpc/platforms/cell/spufs/inode.c	2006-01-10 01:06:10.000000000 +0000
@@ -138,7 +138,7 @@ static void spufs_prune_dir(struct dentr
 {
 	struct dentry *dentry, *tmp;
 	down(&dir->d_inode->i_sem);
-	list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_child) {
+	list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {
 		spin_lock(&dcache_lock);
 		spin_lock(&dentry->d_lock);
 		if (!(d_unhashed(dentry)) && dentry->d_inode) {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- .cvsignore	9 Jan 2006 18:55:14 -0000	1.318
+++ .cvsignore	10 Jan 2006 01:45:59 -0000	1.319
@@ -3,5 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 bcm43xx-20060106.tar.bz2
-ieee80211softmac-20060103.tar.bz2
-patch-2.6.15-git5.bz2
+patch-2.6.15-git5a.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1837
retrieving revision 1.1838
diff -u -r1.1837 -r1.1838
--- kernel-2.6.spec	9 Jan 2006 19:36:56 -0000	1.1837
+++ kernel-2.6.spec	10 Jan 2006 01:45:59 -0000	1.1838
@@ -207,7 +207,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.15-git5.bz2
+Patch1: patch-2.6.15-git5a.bz2
 #Patch2: patch-2.6.16-rc1-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
@@ -226,20 +226,14 @@
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.15-default-powerpc.patch
-Patch302: linux-2.6-serial-of.patch
-Patch303: linux-2.6.15-rc1-ppc64-syscallpath.patch
+Patch301: linux-2.6.15-spufs-compile.patch
 Patch304: linux-2.6.15-mv643xx-fixes.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
-Patch307: linux-2.6-cell-platform-detect.patch
-Patch308: linux-2.6-cell-idle-pmgt.patch
-Patch309: linux-2.6-cell-nvram-kmalloc.patch
 Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
-Patch312: linux-2.6-cell-no-legacy-io.patch
 Patch313: linux-2.6-hvc-rtas-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
 Patch315: linux-2.6-powerpc-parport.patch
-Patch316: linux-2.6-cell-iommu.patch
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
@@ -345,7 +339,6 @@
 Patch1650: linux-2.6-input-kill-stupid-messages.patch
 Patch1660: linux-2.6-input-usblegacy.patch
 Patch1670: linux-2.6-serial-tickle-nmi.patch
-Patch1671: linux-2.6-serial-nrports.patch
 Patch1690: linux-2.6-radeon-backlight.patch
 Patch1700: linux-2.6-ide-tune-locking.patch
 Patch1710: linux-2.6-autofs-pathlookup.patch
@@ -637,36 +630,24 @@
 # 
 # ppc64
 #
-
+# Default to ARCH=powerpc
 %patch300 -p1
-# Don't probe serial ports if they don't exist
-%patch302 -p1
-# Updated ppc/ppc64 system call entry/exit path
-%patch303 -p1
+# Fix spufs build
+%patch301 -p1
 # Fix the MV643xx Gigabit Ethernet driver
 %patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
 %patch306 -p1
-# Detect Cell platforms appropriately
-%patch307 -p1
-# Use PAUSE_ZERO on Cell as appropriate
-%patch308 -p1
-# Fix nvram driver to not kmalloc the entire size of a read() call
-%patch309 -p1
 # Hardcode PIC addresses for Cell spiderpic
 %patch310 -p1
-# Cell has no legacy I/O
-%patch312 -p1
 # RTAS console support
 %patch313 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 # Check before using legacy I/O ports which might crash the machine
 %patch315 -p1
-# Handle new Cell boards with >512MiB RAM
-%patch316 -p1
 # No input layer on iseries
 %patch317 -p1
 
@@ -831,8 +812,6 @@
 %patch1660 -p1
 # Tickle the NMI whilst doing serial writes.
 %patch1670 -p1
-# Limit number of serial ports registered.
-%patch1671 -p1
 # Radeon on thinkpad backlight power-management goodness.
 %patch1690 -p1
 # Fix IDE locking bug.
@@ -1391,6 +1370,9 @@
 %endif
 
 %changelog
+* Tue Jan 10 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7)
+
 * Mon Jan  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git5
 

linux-2.6-hvc-console.patch:
 drivers/char/Kconfig            |   13 +++
 drivers/char/Makefile           |    6 +
 drivers/char/hvc_console.c      |   25 ------
 drivers/char/hvc_console.h      |   83 ++++++++++++++++++++++
 drivers/char/hvc_fss.c          |  149 ++++++++++++++++++++++++++++++++++++++++
 drivers/char/hvc_vio.c          |    1 
 include/asm-powerpc/hvconsole.h |   21 -----
 7 files changed, 252 insertions(+), 46 deletions(-)

Index: linux-2.6-hvc-console.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-hvc-console.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-hvc-console.patch	8 Dec 2005 23:23:53 -0000	1.2
+++ linux-2.6-hvc-console.patch	10 Jan 2006 01:45:59 -0000	1.3
@@ -1,31 +1,3 @@
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c linux-2.6.14/arch/powerpc/kernel/setup-common.c
---- linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c	2005-12-07 16:33:31.000000000 +0100
-+++ linux-2.6.14/arch/powerpc/kernel/setup-common.c	2005-12-07 16:34:00.000000000 +0100
-@@ -304,6 +304,15 @@
- 
- 	DBG(" -> set_preferred_console()\n");
- 
-+#ifdef CONFIG_HVC_FSS
-+	/* if we're on the full system simulator just circumvent the whole
-+	 * picking process because there is no device tree in which we'll
-+	 * find the console device. */
-+	if(__onsim()) {
-+		DBG("Found hvc_fss console\n");
-+		return add_preferred_console("hvc", 0, NULL);
-+	}
-+#endif
- 	/* The user has requested a console so this is already set up. */
- 	if (strstr(saved_command_line, "console=")) {
- 		DBG(" console was specified !\n");
-@@ -385,7 +393,7 @@
-  		} else {
-  			/* pSeries LPAR virtual console */
- 			of_node_put(prom_stdout);
--			DBG("Found hvc console\n");
-+			DBG("Found hvc_vio console\n");
-  			return add_preferred_console("hvc", 0, NULL);
-  		}
- 	}
 diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c
 --- linux-2.6.14.cons/drivers/char/hvc_console.c	2005-12-07 16:33:35.000000000 +0100
 +++ linux-2.6.14/drivers/char/hvc_console.c	2005-12-07 16:33:56.000000000 +0100
@@ -382,9 +354,10 @@
 diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h
 --- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:35.000000000 +0100
 +++ linux-2.6.14/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:56.000000000 +0100
-@@ -22,28 +22,7 @@
+@@ -22,30 +22,9 @@
  #ifndef _PPC64_HVCONSOLE_H
  #define _PPC64_HVCONSOLE_H
+ #ifdef __KERNEL__
  
 -/*
 - * This is the max number of console adapters that can/will be found as
@@ -410,6 +383,7 @@
 -						 struct hv_ops *ops);
 -/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
 -extern int __devexit hvc_remove(struct hvc_struct *hp);
+ #endif /* __KERNEL__ */
  #endif /* _PPC64_HVCONSOLE_H */
 --- linux-2.6.14/drivers/char/hvc_vio.c~	2005-12-07 17:46:48.000000000 +0100
 +++ linux-2.6.14/drivers/char/hvc_vio.c	2005-12-07 18:03:23.000000000 +0100

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    6 
 include/net/ieee80211softmac.h                  |  266 +++++++++++++
 include/net/ieee80211softmac_wx.h               |   66 +++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |    4 
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  356 ++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  350 +++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  135 ++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  425 +++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  211 ++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  216 ++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  390 +++++++++++++++++++
 17 files changed, 2917 insertions(+), 5 deletions(-)

Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-softmac-git.patch	6 Jan 2006 15:01:57 -0000	1.1
+++ linux-2.6-softmac-git.patch	10 Jan 2006 01:45:59 -0000	1.2
@@ -384,99 +384,6 @@
  	ieee80211_geo.o
  
 +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
-diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
-index 073aebd..f8dca31 100644
---- a/net/ieee80211/ieee80211_crypt_wep.c
-+++ b/net/ieee80211/ieee80211_crypt_wep.c
-@@ -75,22 +75,14 @@ static void prism2_wep_deinit(void *priv
- 	kfree(priv);
- }
- 
--/* Perform WEP encryption on given skb that has at least 4 bytes of headroom
-- * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
-- * so the payload length increases with 8 bytes.
-- *
-- * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
-- */
--static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
-+/* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */
-+static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len, void *priv)
- {
- 	struct prism2_wep_data *wep = priv;
--	u32 crc, klen, len;
--	u8 key[WEP_KEY_LEN + 3];
--	u8 *pos, *icv;
--	struct scatterlist sg;
--
--	if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
--	    skb->len < hdr_len)
-+	u32 klen, len;
-+	u8 *pos;
-+	
-+	if (skb_headroom(skb) < 4 || skb->len < hdr_len)
- 		return -1;
- 
- 	len = skb->len - hdr_len;
-@@ -112,15 +104,47 @@ static int prism2_wep_encrypt(struct sk_
- 	}
- 
- 	/* Prepend 24-bit IV to RC4 key and TX frame */
--	*pos++ = key[0] = (wep->iv >> 16) & 0xff;
--	*pos++ = key[1] = (wep->iv >> 8) & 0xff;
--	*pos++ = key[2] = wep->iv & 0xff;
-+	*pos++ = (wep->iv >> 16) & 0xff;
-+	*pos++ = (wep->iv >> 8) & 0xff;
-+	*pos++ = wep->iv & 0xff;
- 	*pos++ = wep->key_idx << 6;
- 
-+	return 0;
-+}
-+
-+/* Perform WEP encryption on given skb that has at least 4 bytes of headroom
-+ * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
-+ * so the payload length increases with 8 bytes.
-+ *
-+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
-+ */
-+static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
-+{
-+	struct prism2_wep_data *wep = priv;
-+	u32 crc, klen, len;
-+	u8 *pos, *icv;
-+	struct scatterlist sg;
-+	u8 key[WEP_KEY_LEN + 3];
-+
-+	/* other checks are in prism2_wep_build_iv */
-+	if (skb_tailroom(skb) < 4)
-+		return -1;
-+	
-+	/* add the IV to the frame */
-+	if (prism2_wep_build_iv(skb, hdr_len, priv))
-+		return -1;
-+	
-+	/* Copy the IV into the first 3 bytes of the key */
-+	memcpy(key, skb->data + hdr_len, 3);
-+
- 	/* Copy rest of the WEP key (the secret part) */
- 	memcpy(key + 3, wep->key, wep->key_len);
-+	
-+	len = skb->len - hdr_len - 4;
-+	pos = skb->data + hdr_len + 4;
-+	klen = 3 + wep->key_len;
- 
--	/* Append little-endian CRC32 and encrypt it to produce ICV */
-+	/* Append little-endian CRC32 over only the data and encrypt it to produce ICV */
- 	crc = ~crc32_le(~0, pos, len);
- 	icv = skb_put(skb, 4);
- 	icv[0] = crc;
-@@ -231,6 +255,7 @@ static struct ieee80211_crypto_ops ieee8
- 	.name = "WEP",
- 	.init = prism2_wep_init,
- 	.deinit = prism2_wep_deinit,
-+	.build_iv = prism2_wep_build_iv,
- 	.encrypt_mpdu = prism2_wep_encrypt,
- 	.decrypt_mpdu = prism2_wep_decrypt,
- 	.encrypt_msdu = NULL,
 diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
 index 321287b..22abfca 100644
 --- a/net/ieee80211/ieee80211_module.c
@@ -506,32 +413,6 @@
  }
  
  static inline void ieee80211_process_probe_response(struct ieee80211_device
-diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
-index 445f206..e5b33c8 100644
---- a/net/ieee80211/ieee80211_tx.c
-+++ b/net/ieee80211/ieee80211_tx.c
-@@ -288,7 +288,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
- 	/* Determine total amount of storage required for TXB packets */
- 	bytes = skb->len + SNAP_SIZE + sizeof(u16);
- 
--	if (host_encrypt)
-+	if (host_encrypt || host_build_iv)
- 		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
- 		    IEEE80211_FCTL_PROTECTED;
- 	else
-diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
-index 181755f..406d5b9 100644
---- a/net/ieee80211/ieee80211_wx.c
-+++ b/net/ieee80211/ieee80211_wx.c
-@@ -284,7 +284,7 @@ int ieee80211_wx_set_encode(struct ieee8
- 	};
- 	int i, key, key_provided, len;
- 	struct ieee80211_crypt_data **crypt;
--	int host_crypto = ieee->host_encrypt || ieee->host_decrypt;
-+	int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv;
- 
- 	IEEE80211_DEBUG_WX("SET_ENCODE\n");
- 
 diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig
 new file mode 100644
 index 0000000..6cd9f34
@@ -565,7 +446,7 @@
 +			ieee80211softmac_event.o
 diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
 new file mode 100644
-index 0000000..9848744
+index 0000000..085022f
 --- /dev/null
 +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
 @@ -0,0 +1,356 @@
@@ -839,7 +720,7 @@
 +	if (mac->set_bssid_filter)
 +		mac->set_bssid_filter(mac->dev, net->bssid);
 +	memcpy(mac->ieee->bssid, net->bssid, ETH_ALEN);
-+	mac->dev->flags |= IFF_RUNNING;
++	netif_carrier_on(mac->dev);
 +	
 +	mac->association_id = le16_to_cpup(&resp->aid);
 +}
@@ -917,7 +798,7 @@
 +	struct ieee80211softmac_device *mac = ieee80211_priv(dev);
 +	unsigned long flags;
 +	dprintk(KERN_INFO PFX "got disassoc frame\n");
-+	
++	netif_carrier_off(dev);
 +	spin_lock_irqsave(&mac->lock, flags);
 +	mac->associnfo.bssvalid = 0;
 +	mac->associated = 0;
@@ -927,10 +808,10 @@
 +}
 diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
 new file mode 100644
-index 0000000..5a77352
+index 0000000..6eab2be
 --- /dev/null
 +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
-@@ -0,0 +1,348 @@
+@@ -0,0 +1,350 @@
 +#include "ieee80211softmac_priv.h"
 +
 +static void ieee80211softmac_auth_queue(void *data);
@@ -1211,6 +1092,8 @@
 +		kfree(net->challenge);
 +	kfree(net);
 +	
++	/* can't transmit data right now... */
++	netif_carrier_off(mac->dev);
 +	/* let's try to re-associate */
 +	schedule_work(&mac->associnfo.work);
 +	spin_unlock_irqrestore(&mac->lock, flags);
@@ -1902,10 +1785,10 @@
 +}
 diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
 new file mode 100644
-index 0000000..79ef959
+index 0000000..ea4a19e
 --- /dev/null
 +++ b/net/ieee80211/softmac/ieee80211softmac_module.c
-@@ -0,0 +1,436 @@
+@@ -0,0 +1,425 @@
 +#include "ieee80211softmac_priv.h"
 +#include <linux/sort.h>
 +
@@ -1948,21 +1831,10 @@
 +	softmac->txrates.default_rate = IEEE80211_CCK_RATE_1MB;
 +	softmac->txrates.default_fallback = IEEE80211_CCK_RATE_1MB;
 +
-+	/* should we also assign softmac->mgmt_xmit here so
-+	 * that it is always valid? If so, we probably want
-+	 * to define a new function for that which just
-+	 * wraps ieee80211_tx_frame
-+	 */
++	/* to start with, we can't send anything ... */
++	netif_carrier_off(dev);
 +	
-+	/* until associated, we're not ready */
-+	dev->flags &= ~IFF_RUNNING;
-+
 +	return dev;
-+
-+err_free_ieee80211:
-+ 	free_ieee80211(dev);
-+
-+	return NULL;
 +}
 +
 +/* Clears the pending work queue items, stops all scans, etc. */


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- sources	9 Jan 2006 18:55:15 -0000	1.260
+++ sources	10 Jan 2006 01:45:59 -0000	1.261
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 1e8dda938d8fb06863d7276b79d6e544  bcm43xx-20060106.tar.bz2
 1eb2bb778090c59fbeba6278d63a9309  ieee80211softmac-20060103.tar.bz2
-f05d69868a2452b980185889f5a14fb4  patch-2.6.15-git5.bz2
+82d5bf398cb12769fb2431964045982f  patch-2.6.15-git5a.bz2


--- linux-2.6-cell-idle-pmgt.patch DELETED ---


--- linux-2.6-cell-iommu.patch DELETED ---


--- linux-2.6-cell-no-legacy-io.patch DELETED ---


--- linux-2.6-cell-nvram-kmalloc.patch DELETED ---


--- linux-2.6-cell-platform-detect.patch DELETED ---


--- linux-2.6-serial-nrports.patch DELETED ---


--- linux-2.6-serial-of.patch DELETED ---


--- linux-2.6.15-rc1-ppc64-syscallpath.patch DELETED ---


