rpms/kernel/devel patch-2.6.21-rc5-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.595, 1.596 git-wireless-dev.patch, 1.4, 1.5 kernel-2.6.spec, 1.3027, 1.3028 nouveau-drm.patch, 1.1, 1.2 sources, 1.558, 1.559 upstream, 1.486, 1.487 linux-2.6-bcm43xx-spec-change-backout.patch, 1.3, NONE linux-2.6-fix-ipv6.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 30 06:28:00 UTC 2007
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27378
Modified Files:
.cvsignore git-wireless-dev.patch kernel-2.6.spec
nouveau-drm.patch sources upstream
Added Files:
patch-2.6.21-rc5-git4.bz2.sign
Removed Files:
linux-2.6-bcm43xx-spec-change-backout.patch
linux-2.6-fix-ipv6.patch
Log Message:
* Fri Mar 30 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc5-git4
--- NEW FILE patch-2.6.21-rc5-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBGC2jhyGugalF9Dw4RAgJ3AJ9U830zGTnrW/TFiNRuKWseIHPhAwCeJW7K
utAo89ZkRybYJA3guo3OVBI=
=jhe1
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- .cvsignore 26 Mar 2007 01:38:48 -0000 1.595
+++ .cvsignore 30 Mar 2007 06:27:57 -0000 1.596
@@ -5,3 +5,4 @@
kernel-2.6.20
linux-2.6.20.tar.bz2
patch-2.6.21-rc5.bz2
+patch-2.6.21-rc5-git4.bz2
git-wireless-dev.patch:
CREDITS | 31
MAINTAINERS | 54
drivers/Kconfig | 2
drivers/Makefile | 1
drivers/net/Makefile | 2
drivers/net/wireless/Kconfig | 120
drivers/net/wireless/Makefile | 3
drivers/net/wireless/bcm43xx/Kconfig | 3
drivers/net/wireless/hostap/Kconfig | 3
drivers/net/wireless/mac80211/Kconfig | 6
drivers/net/wireless/mac80211/Makefile | 6
drivers/net/wireless/mac80211/README | 2
drivers/net/wireless/mac80211/adm8211/Kconfig | 25
drivers/net/wireless/mac80211/adm8211/Makefile | 1
drivers/net/wireless/mac80211/adm8211/adm8211.c | 2188 +++++++
drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 ++
drivers/net/wireless/mac80211/bcm43xx/Kconfig | 100
drivers/net/wireless/mac80211/bcm43xx/Makefile | 16
drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 870 ++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1297 ++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1081 +++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 3988 ++++++++++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4235 +++++++++++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c | 202
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h | 83
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 615 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 215
drivers/net/wireless/mac80211/p54/Kconfig | 10
drivers/net/wireless/mac80211/p54/Makefile | 4
drivers/net/wireless/mac80211/p54/net2280.h | 452 +
drivers/net/wireless/mac80211/p54/prism54.h | 77
drivers/net/wireless/mac80211/p54/prism54common.c | 807 ++
drivers/net/wireless/mac80211/p54/prism54common.h | 304
drivers/net/wireless/mac80211/p54/prism54magic.h | 77
drivers/net/wireless/mac80211/p54/prism54pci.c | 698 ++
drivers/net/wireless/mac80211/p54/prism54pci.h | 106
drivers/net/wireless/mac80211/p54/prism54usb.c | 946 +++
drivers/net/wireless/mac80211/p54/prism54usb.h | 133
drivers/net/wireless/mac80211/rt2x00/Kconfig | 86
drivers/net/wireless/mac80211/rt2x00/Makefile | 9
drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2586 ++++++++
drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 931 +++
drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 2883 +++++++++
drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1198 +++
drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 2718 ++++++++
drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 746 ++
drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1069 +++
drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 380 +
drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 70
drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 231
drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 74
drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 540 +
drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 39
drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 82
drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3364 ++++++++++
drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1361 ++++
drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 3024 +++++++++
drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 945 +++
drivers/net/wireless/mac80211/rtl818x/Kconfig | 9
drivers/net/wireless/mac80211/rtl818x/Makefile | 2
drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126
drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 720 ++
drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++
drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30
drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 177
drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19
drivers/net/wireless/mac80211/zd1211rw/Makefile | 11
drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1676 +++++
drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 909 ++
drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57
drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67
drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 705 ++
drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250
drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 156
drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 81
drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 +
drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 274
drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279
drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1327 ++++
drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241
drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82
drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29
drivers/net/wireless/zd1211rw/Kconfig | 3
drivers/ssb/Kconfig | 93
drivers/ssb/Makefile | 11
drivers/ssb/driver_chipcommon.c | 402 +
drivers/ssb/driver_mipscore.c | 258
drivers/ssb/driver_pcicore.c | 556 +
drivers/ssb/main.c | 1042 +++
drivers/ssb/pci.c | 667 ++
drivers/ssb/pcihost_wrapper.c | 104
drivers/ssb/pcmcia.c | 256
drivers/ssb/scan.c | 407 +
drivers/ssb/ssb_private.h | 151
drivers/usb/host/Kconfig | 13
drivers/usb/host/ohci-hcd.c | 21
drivers/usb/host/ohci-ssb.c | 254
include/linux/Kbuild | 2
include/linux/crc-itu-t.h | 27
include/linux/eeprom_93cx6.h | 77
include/linux/ieee80211.h | 330 +
include/linux/netdevice.h | 7
include/linux/nl80211.h | 275
include/linux/ssb/ssb.h | 403 +
include/linux/ssb/ssb_driver_chipcommon.h | 387 +
include/linux/ssb/ssb_driver_extif.h | 163
include/linux/ssb/ssb_driver_mips.h | 47
include/linux/ssb/ssb_driver_pci.h | 108
include/linux/ssb/ssb_regs.h | 294
include/net/cfg80211.h | 169
include/net/iw_handler.h | 3
include/net/mac80211.h | 1074 +++
include/net/wireless.h | 160
lib/Kconfig | 16
lib/Makefile | 3
lib/crc-itu-t.c | 64
lib/eeprom_93cx6.c | 344 +
net/Kconfig | 12
net/Makefile | 2
net/core/Makefile | 1
net/core/dev.c | 33
net/core/wireless.c | 2371 -------
net/ieee80211/Kconfig | 3
net/mac80211/Kconfig | 71
net/mac80211/Makefile | 26
net/mac80211/aes_ccm.c | 155
net/mac80211/aes_ccm.h | 26
net/mac80211/fifo_qdisc.c | 102
net/mac80211/hostapd_ioctl.h | 347 +
net/mac80211/ieee80211.c | 4940 ++++++++++++++++
net/mac80211/ieee80211_cfg.c | 90
net/mac80211/ieee80211_cfg.h | 9
net/mac80211/ieee80211_common.h | 98
net/mac80211/ieee80211_i.h | 720 ++
net/mac80211/ieee80211_iface.c | 372 +
net/mac80211/ieee80211_ioctl.c | 3304 ++++++++++
net/mac80211/ieee80211_key.h | 89
net/mac80211/ieee80211_led.c | 91
net/mac80211/ieee80211_led.h | 32
net/mac80211/ieee80211_rate.c | 140
net/mac80211/ieee80211_rate.h | 161
net/mac80211/ieee80211_scan.c | 344 +
net/mac80211/ieee80211_sta.c | 3013 +++++++++
net/mac80211/ieee80211_sysfs.c | 718 ++
net/mac80211/ieee80211_sysfs.h | 12
net/mac80211/ieee80211_sysfs_sta.c | 438 +
net/mac80211/michael.c | 104
net/mac80211/michael.h | 20
net/mac80211/rc80211_simple.c | 399 +
net/mac80211/sta_info.c | 461 +
net/mac80211/sta_info.h | 150
net/mac80211/tkip.c | 341 +
net/mac80211/tkip.h | 36
net/mac80211/wep.c | 328 +
net/mac80211/wep.h | 40
net/mac80211/wme.c | 679 ++
net/mac80211/wme.h | 38
net/mac80211/wpa.c | 846 ++
net/mac80211/wpa.h | 31
net/wireless/Kconfig | 46
net/wireless/Makefile | 17
net/wireless/core.c | 323 +
net/wireless/core.h | 77
net/wireless/nl80211.c | 1051 +++
net/wireless/nl80211.h | 17
net/wireless/sysfs.c | 125
net/wireless/sysfs.h | 9
net/wireless/wext-common.c | 663 ++
net/wireless/wext-compat.c | 819 ++
net/wireless/wext-export.c | 29
net/wireless/wext-mod.c | 20
net/wireless/wext-old.c | 1461 ++++
net/wireless/wext.h | 51
191 files changed, 85347 insertions(+), 2487 deletions(-)
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-wireless-dev.patch 23 Mar 2007 18:13:09 -0000 1.4
+++ git-wireless-dev.patch 30 Mar 2007 06:27:57 -0000 1.5
@@ -62833,14 +62833,14 @@
obj-$(CONFIG_NETPOLL) += netpoll.o
obj-$(CONFIG_NET_DMA) += user_dma.o
obj-$(CONFIG_FIB_RULES) += fib_rules.o
---- linux-2.6.20.noarch/net/core/wireless.c.orig 2007-03-20 11:27:30.000000000 -0400
-+++ linux-2.6.20.noarch/net/core/wireless.c 2007-03-20 11:29:04.000000000 -0400
-@@ -1,2353 +0,0 @@
+--- linux-2.6.20.noarch/net/core/wireless.c~ 2007-03-30 02:18:36.000000000 -0400
++++ linux-2.6.20.noarch/net/core/wireless.c 2007-03-30 02:18:50.000000000 -0400
+@@ -1,2371 +0,0 @@
-/*
- * This file implement the Wireless Extensions APIs.
- *
- * Authors : Jean Tourrilhes - HPL - <jt at hpl.hp.com>
-- * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
+- * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
- *
- * (As all part of the Linux kernel, this file is GPL)
- */
@@ -62914,6 +62914,9 @@
- * o Change length in ESSID and NICK to strlen() instead of strlen()+1
- * o Make standard_ioctl_num and standard_event_num unsigned
- * o Remove (struct net_device *)->get_wireless_stats()
+- *
+- * v10 - 16.3.07 - Jean II
+- * o Prevent leaking of kernel space in stream on 64 bits.
- */
-
-/***************************** INCLUDES *****************************/
@@ -63265,6 +63268,21 @@
- IW_EV_QUAL_LEN, /* IW_HEADER_TYPE_QUAL */
-};
-
+-/* Size (in bytes) of various events, as packed */
+-static const int event_type_pk_size[] = {
+- IW_EV_LCP_PK_LEN, /* IW_HEADER_TYPE_NULL */
+- 0,
+- IW_EV_CHAR_PK_LEN, /* IW_HEADER_TYPE_CHAR */
+- 0,
+- IW_EV_UINT_PK_LEN, /* IW_HEADER_TYPE_UINT */
+- IW_EV_FREQ_PK_LEN, /* IW_HEADER_TYPE_FREQ */
+- IW_EV_ADDR_PK_LEN, /* IW_HEADER_TYPE_ADDR */
+- 0,
+- IW_EV_POINT_PK_LEN, /* Without variable payload */
+- IW_EV_PARAM_PK_LEN, /* IW_HEADER_TYPE_PARAM */
+- IW_EV_QUAL_PK_LEN, /* IW_HEADER_TYPE_QUAL */
+-};
+-
-/************************ COMMON SUBROUTINES ************************/
-/*
- * Stuff that may be used in various place or doesn't fit in one
@@ -64055,7 +64073,7 @@
- memcpy(buffer + IW_EV_POINT_OFF, request, request_len);
- /* Use our own copy of wrqu */
- wrqu = (union iwreq_data *) (buffer + IW_EV_POINT_OFF
-- + IW_EV_LCP_LEN);
+- + IW_EV_LCP_PK_LEN);
-
- /* No extra arguments. Trivial to handle */
- ret = handler(dev, &info, wrqu, NULL);
@@ -64067,8 +64085,8 @@
-
- /* Get a temp copy of wrqu (skip pointer) */
- memcpy(((char *) &wrqu_point) + IW_EV_POINT_OFF,
-- ((char *) request) + IW_EV_LCP_LEN,
-- IW_EV_POINT_LEN - IW_EV_LCP_LEN);
+- ((char *) request) + IW_EV_LCP_PK_LEN,
+- IW_EV_POINT_LEN - IW_EV_LCP_PK_LEN);
-
- /* Calculate space needed by arguments. Always allocate
- * for max space. Easier, and won't last long... */
@@ -64078,7 +64096,7 @@
- (wrqu_point.data.length > descr->max_tokens))
- extra_size = (wrqu_point.data.length
- * descr->token_size);
-- buffer_size = extra_size + IW_EV_POINT_LEN + IW_EV_POINT_OFF;
+- buffer_size = extra_size + IW_EV_POINT_PK_LEN + IW_EV_POINT_OFF;
-#ifdef WE_RTNETLINK_DEBUG
- printk(KERN_DEBUG "%s (WE.r) : Malloc %d bytes (%d bytes)\n",
- dev->name, extra_size, buffer_size);
@@ -64092,15 +64110,15 @@
-
- /* Put wrqu in the right place (just before extra).
- * Leave space for IWE header and dummy pointer...
-- * Note that IW_EV_LCP_LEN==4 bytes, so it's still aligned...
+- * Note that IW_EV_LCP_PK_LEN==4 bytes, so it's still aligned.
- */
-- memcpy(buffer + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
+- memcpy(buffer + IW_EV_LCP_PK_LEN + IW_EV_POINT_OFF,
- ((char *) &wrqu_point) + IW_EV_POINT_OFF,
-- IW_EV_POINT_LEN - IW_EV_LCP_LEN);
-- wrqu = (union iwreq_data *) (buffer + IW_EV_LCP_LEN);
+- IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);
+- wrqu = (union iwreq_data *) (buffer + IW_EV_LCP_PK_LEN);
-
- /* Extra comes logically after that. Offset +12 bytes. */
-- extra = buffer + IW_EV_POINT_OFF + IW_EV_POINT_LEN;
+- extra = buffer + IW_EV_POINT_OFF + IW_EV_POINT_PK_LEN;
-
- /* Call the handler */
- ret = handler(dev, &info, wrqu, extra);
@@ -64108,11 +64126,11 @@
- /* Calculate real returned length */
- extra_size = (wrqu->data.length * descr->token_size);
- /* Re-adjust reply size */
-- request->len = extra_size + IW_EV_POINT_LEN;
+- request->len = extra_size + IW_EV_POINT_PK_LEN;
-
- /* Put the iwe header where it should, i.e. scrap the
- * dummy pointer. */
-- memcpy(buffer + IW_EV_POINT_OFF, request, IW_EV_LCP_LEN);
+- memcpy(buffer + IW_EV_POINT_OFF, request, IW_EV_LCP_PK_LEN);
-
-#ifdef WE_RTNETLINK_DEBUG
- printk(KERN_DEBUG "%s (WE.r) : Reply 0x%04X, hdr_len %d, tokens %d, extra_size %d, buffer_size %d\n", dev->name, cmd, hdr_len, wrqu->data.length, extra_size, buffer_size);
@@ -64169,10 +64187,10 @@
-#endif /* WE_RTNETLINK_DEBUG */
-
- /* Extract fixed header from request. This is properly aligned. */
-- wrqu = &request->u;
+- wrqu = (union iwreq_data *) (((char *) request) + IW_EV_LCP_PK_LEN);
-
- /* Check if wrqu is complete */
-- hdr_len = event_type_size[descr->header_type];
+- hdr_len = event_type_pk_size[descr->header_type];
- if(request_len < hdr_len) {
-#ifdef WE_RTNETLINK_DEBUG
- printk(KERN_DEBUG
@@ -64197,7 +64215,7 @@
-
- /* Put wrqu in the right place (skip pointer) */
- memcpy(((char *) &wrqu_point) + IW_EV_POINT_OFF,
-- wrqu, IW_EV_POINT_LEN - IW_EV_LCP_LEN);
+- wrqu, IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);
- /* Don't forget about the event code... */
- wrqu = &wrqu_point;
-
@@ -64321,7 +64339,7 @@
- hdr_len = extra_size;
- extra_size = 0;
- } else {
-- hdr_len = IW_EV_POINT_LEN;
+- hdr_len = IW_EV_POINT_PK_LEN;
- }
-
- /* Check if wrqu is complete */
@@ -64352,7 +64370,7 @@
- memcpy(buffer + IW_EV_POINT_OFF, request, request_len);
- /* Use our own copy of wrqu */
- wrqu = (union iwreq_data *) (buffer + IW_EV_POINT_OFF
-- + IW_EV_LCP_LEN);
+- + IW_EV_LCP_PK_LEN);
-
- /* No extra arguments. Trivial to handle */
- ret = handler(dev, &info, wrqu, (char *) wrqu);
@@ -64361,7 +64379,7 @@
- char * extra;
-
- /* Buffer for full reply */
-- buffer_size = extra_size + IW_EV_POINT_LEN + IW_EV_POINT_OFF;
+- buffer_size = extra_size + IW_EV_POINT_PK_LEN + IW_EV_POINT_OFF;
-
-#ifdef WE_RTNETLINK_DEBUG
- printk(KERN_DEBUG "%s (WE.r) : Malloc %d bytes (%d bytes)\n",
@@ -64376,15 +64394,15 @@
-
- /* Put wrqu in the right place (just before extra).
- * Leave space for IWE header and dummy pointer...
-- * Note that IW_EV_LCP_LEN==4 bytes, so it's still aligned...
+- * Note that IW_EV_LCP_PK_LEN==4 bytes, so it's still aligned.
- */
-- memcpy(buffer + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
-- ((char *) request) + IW_EV_LCP_LEN,
-- IW_EV_POINT_LEN - IW_EV_LCP_LEN);
-- wrqu = (union iwreq_data *) (buffer + IW_EV_LCP_LEN);
+- memcpy(buffer + IW_EV_LCP_PK_LEN + IW_EV_POINT_OFF,
+- ((char *) request) + IW_EV_LCP_PK_LEN,
+- IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);
+- wrqu = (union iwreq_data *) (buffer + IW_EV_LCP_PK_LEN);
-
- /* Extra comes logically after that. Offset +12 bytes. */
-- extra = buffer + IW_EV_POINT_OFF + IW_EV_POINT_LEN;
+- extra = buffer + IW_EV_POINT_OFF + IW_EV_POINT_PK_LEN;
-
- /* Call the handler */
- ret = handler(dev, &info, wrqu, extra);
@@ -64394,11 +64412,11 @@
- if (!(descr->get_args & IW_PRIV_SIZE_FIXED))
- extra_size = adjust_priv_size(descr->get_args, wrqu);
- /* Re-adjust reply size */
-- request->len = extra_size + IW_EV_POINT_LEN;
+- request->len = extra_size + IW_EV_POINT_PK_LEN;
-
- /* Put the iwe header where it should, i.e. scrap the
- * dummy pointer. */
-- memcpy(buffer + IW_EV_POINT_OFF, request, IW_EV_LCP_LEN);
+- memcpy(buffer + IW_EV_POINT_OFF, request, IW_EV_LCP_PK_LEN);
-
-#ifdef WE_RTNETLINK_DEBUG
- printk(KERN_DEBUG "%s (WE.r) : Reply 0x%04X, hdr_len %d, tokens %d, extra_size %d, buffer_size %d\n", dev->name, cmd, hdr_len, wrqu->data.length, extra_size, buffer_size);
@@ -64479,14 +64497,14 @@
- /* Does it fits in wrqu ? */
- if((descr->set_args & IW_PRIV_SIZE_FIXED) &&
- (extra_size <= IFNAMSIZ)) {
-- hdr_len = IW_EV_LCP_LEN + extra_size;
+- hdr_len = IW_EV_LCP_PK_LEN + extra_size;
- extra_size = 0;
- } else {
-- hdr_len = IW_EV_POINT_LEN;
+- hdr_len = IW_EV_POINT_PK_LEN;
- }
-
- /* Extract fixed header from request. This is properly aligned. */
-- wrqu = &request->u;
+- wrqu = (union iwreq_data *) (((char *) request) + IW_EV_LCP_PK_LEN);
-
- /* Check if wrqu is complete */
- if(request_len < hdr_len) {
@@ -64513,7 +64531,7 @@
-
- /* Put wrqu in the right place (skip pointer) */
- memcpy(((char *) &wrqu_point) + IW_EV_POINT_OFF,
-- wrqu, IW_EV_POINT_LEN - IW_EV_LCP_LEN);
+- wrqu, IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);
-
- /* Does it fits within bounds ? */
- if(wrqu_point.data.length > (descr->set_args &
@@ -64576,7 +64594,7 @@
- iw_handler handler;
-
- /* Check length */
-- if(len < IW_EV_LCP_LEN) {
+- if(len < IW_EV_LCP_PK_LEN) {
- printk(KERN_DEBUG "%s (WE.r) : RtNetlink request too short (%d)\n",
- dev->name, len);
- return -EINVAL;
@@ -64660,7 +64678,7 @@
- iw_handler handler;
-
- /* Check length */
-- if(len < IW_EV_LCP_LEN) {
+- if(len < IW_EV_LCP_PK_LEN) {
- printk(KERN_DEBUG "%s (WE.r) : RtNetlink request too short (%d)\n",
- dev->name, len);
- return -EINVAL;
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3027
retrieving revision 1.3028
diff -u -r1.3027 -r1.3028
--- kernel-2.6.spec 30 Mar 2007 06:03:15 -0000 1.3027
+++ kernel-2.6.spec 30 Mar 2007 06:27:57 -0000 1.3028
@@ -305,6 +305,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
Patch1: patch-2.6.21-rc5.bz2
+Patch2: patch-2.6.21-rc5-git4.bz2
Patch3: git-geode.patch
# Patches 10 through 99 are for things that are going upstream really soon.
@@ -316,7 +317,6 @@
Patch15: linux-2.6-fix-pmops-1.patch
Patch16: linux-2.6-fix-pmops-2.patch
Patch17: linux-2.6-fix-pmops-3.patch
-Patch18: linux-2.6-fix-ipv6.patch
# enable sysrq-c on all kernels, not only kexec
Patch20: linux-2.6-sysrq-c.patch
@@ -430,7 +430,6 @@
Patch1201: linux-2.6-NFSD-badness.patch
# NIC driver fixes
-Patch1300: linux-2.6-bcm43xx-spec-change-backout.patch
# Filesystem stuff.
# Squashfs
@@ -873,6 +872,7 @@
# Update to latest upstream.
%patch1 -p1
+%patch2 -p1
# Patches 10 through 100 are meant for core subsystem upgrades
@@ -887,11 +887,9 @@
# ...plus some fixes not yet in Intel's tree
%patch14 -p1
# Power management fixes
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-# Fix NetworkManager IPv6 failure
-%patch18 -p1
+#%patch15 -p1
+#%patch16 -p1
+#%patch17 -p1
# sysrq works always
%patch20 -p1
@@ -1078,8 +1076,6 @@
%patch1201 -p1
# NIC driver fixes
-# Back-out bcm43xx spec-related changes
-%patch1300 -p1
# Filesystem patches.
# Squashfs
@@ -2146,6 +2142,9 @@
%changelog
* Fri Mar 30 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc5-git4
+
+* Fri Mar 30 2007 Dave Jones <davej at redhat.com>
- Reenable tickless.
* Fri Mar 30 2007 David Woodhouse <dwmw2 at redhat.com>
nouveau-drm.patch:
Kconfig | 6
Makefile | 7
drm_bufs.c | 1
drm_pciids.h | 231 +++++++++++++
nouveau_drm.h | 153 ++++++++
nouveau_drv.c | 96 +++++
nouveau_drv.h | 247 ++++++++++++++
nouveau_fifo.c | 756 ++++++++++++++++++++++++++++++++++++++++++++
nouveau_ioc32.c | 73 ++++
nouveau_irq.c | 397 +++++++++++++++++++++++
nouveau_mem.c | 613 +++++++++++++++++++++++++++++++++++
nouveau_object.c | 578 +++++++++++++++++++++++++++++++++
nouveau_reg.h | 404 +++++++++++++++++++++++
nouveau_state.c | 240 ++++++++++++++
nv04_graph.c | 234 +++++++++++++
nv10_graph.c | 609 +++++++++++++++++++++++++++++++++++
nv20_graph.c | 155 +++++++++
nv30_graph.c | 154 +++++++++
nv40_graph.c | 937 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
19 files changed, 5889 insertions(+), 2 deletions(-)
Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/nouveau-drm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-drm.patch 15 Feb 2007 04:04:46 -0000 1.1
+++ nouveau-drm.patch 30 Mar 2007 06:27:58 -0000 1.2
@@ -42,23 +42,17 @@
index 3ad0f64..5f8eafa 100644
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
-@@ -14,18 +14,23 @@ mga-objs := mga_drv.o mga_dma.o mga_s
+@@ -14,6 +14,9 @@ mga-objs := mga_drv.o mga_dma.o mga_s
i810-objs := i810_drv.o i810_dma.o
i830-objs := i830_drv.o i830_dma.o i830_irq.o
i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
+nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
+ nouveau_object.o nouveau_irq.o nv04_graph.o nv10_graph.o \
-+ nv20_graph.o nv30_graph.o nv40_graph.o
++ nv20_graph.o nv30_graph.o nv40_graph.o
radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
- ffb-objs := ffb_drv.o ffb_context.o
sis-objs := sis_drv.o sis_mm.o
savage-objs := savage_drv.o savage_bci.o savage_state.o
- via-objs := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
-
-+
- ifeq ($(CONFIG_COMPAT),y)
- drm-objs += drm_ioc32.o
- radeon-objs += radeon_ioc32.o
+@@ -25,6 +28,7 @@ radeon-objs += radeon_ioc32.o
mga-objs += mga_ioc32.o
r128-objs += r128_ioc32.o
i915-objs += i915_ioc32.o
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- sources 26 Mar 2007 01:38:48 -0000 1.558
+++ sources 30 Mar 2007 06:27:58 -0000 1.559
@@ -1,3 +1,4 @@
2618cbcc9c9ac1c3c04be903fe3338a7 sparse-0.2.tar.bz2
34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2
b7bf3ee2f3ee778afa1ff0e8d44d193e patch-2.6.21-rc5.bz2
+80835bff2edcd75f2415d8b3430af6c3 patch-2.6.21-rc5-git4.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- upstream 26 Mar 2007 01:38:48 -0000 1.486
+++ upstream 30 Mar 2007 06:27:58 -0000 1.487
@@ -1,2 +1,3 @@
linux-2.6.20.tar.bz2
patch-2.6.21-rc5.bz2
+patch-2.6.21-rc5-git4.bz2
--- linux-2.6-bcm43xx-spec-change-backout.patch DELETED ---
--- linux-2.6-fix-ipv6.patch DELETED ---
More information about the fedora-cvs-commits
mailing list