rpms/kernel/devel kernel-2.6.spec, 1.1343, 1.1344 linux-2.6.9-ieee80211.patch, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6.9-ieee80211.patch 
Log Message:
Another div by zero. Hrmph.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- kernel-2.6.spec	23 May 2005 19:39:29 -0000	1.1343
+++ kernel-2.6.spec	23 May 2005 19:45:45 -0000	1.1344
@@ -1245,6 +1245,7 @@
 - Fix absolute symlink in -devel (#158582)
 - 2.6.12-rc4-git7
   PPC64 & i2c fixes
+- Fix another divide by zero in ipw2100 (#158406)
 
 * Sun May 21 2005 Dave Jones <davej at redhat.com>
 - Fix divide by zero in ipw2100 driver. (#158406)

linux-2.6.9-ieee80211.patch:
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_crypt.c      |   28 
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_crypt_ccmp.c |   17 
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_crypt_tkip.c |   14 
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_crypt_wep.c  |   11 
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_geo.c        |  155 +
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_module.c     |   56 
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_rx.c         |  657 ++++-
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_tx.c         |  154 -
 linux-2.6.11-ipw2200-update/drivers/net/wireless/ieee80211/ieee80211_wx.c         |  273 +-
 linux-2.6.11-ipw2200-update/include/net/ieee80211.h                               | 1016 ++++++++
 linux-2.6.11-ipw2200-update/include/net/ieee80211_crypt.h                         |  104 
 linux-2.6.11/drivers/net/wireless/ieee80211/Makefile                              |    3 
 linux-2.6.11/drivers/net/wireless/ieee80211/ieee80211_wx.c                        |    4 
 linux-3022/drivers/net/wireless/Makefile                                          |    1 
 linux-3022/drivers/net/wireless/ieee80211/LICENSE                                 |  339 ++
 linux-3022/drivers/net/wireless/ieee80211/Makefile                                |   23 
 linux-3022/drivers/net/wireless/ieee80211/ieee80211.h                             |  877 +++++++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt.c                       |  253 ++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt.h                       |  104 
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt_ccmp.c                  |  477 ++++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt_tkip.c                  |  714 ++++++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt_wep.c                   |  277 ++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_module.c                      |  266 ++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_rx.c                          | 1183 ++++++++++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_tx.c                          |  464 +++
 linux-3022/drivers/net/wireless/ieee80211/ieee80211_wx.c                          |  526 ++++
 26 files changed, 7542 insertions(+), 454 deletions(-)

Index: linux-2.6.9-ieee80211.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-ieee80211.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6.9-ieee80211.patch	22 May 2005 05:59:24 -0000	1.8
+++ linux-2.6.9-ieee80211.patch	23 May 2005 19:45:45 -0000	1.9
@@ -9335,3 +9335,14 @@
  	}
  
  	spin_unlock_irqrestore(&ieee->lock, flags);
+--- linux-2.6.11/drivers/net/wireless/ieee80211/ieee80211_wx.c~	2005-05-23 15:43:48.000000000 -0400
++++ linux-2.6.11/drivers/net/wireless/ieee80211/ieee80211_wx.c	2005-05-23 15:44:44.000000000 -0400
+@@ -218,7 +218,7 @@ static inline char *ipw2100_translate_sc
+ 	iwe.cmd = IWEVCUSTOM;
+ 	p = custom;
+ 	p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
+-		      " Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100));
++		      " Last beacon: %lums ago", (jiffies - network->last_scanned));
+ 	iwe.u.data.length = p - custom;
+ 	if (iwe.u.data.length)
+ 		start = iwe_stream_add_point(start, stop, &iwe, custom);