Cset exclude: [email protected]|ChangeSet|20050209150113|54411
Linux Kernel Mailing List <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1564, 2005/02/09 14:11:50-02:00, [email protected] Cset exclude: [email protected]|ChangeSet|20050209150113|54411 drivers/char/agp/agp.h | 6 --- drivers/char/agp/agpgart_be.c | 65 +++++++----------------------------------- net/core/wireless.c | 30 +------------------ 3 files changed, 13 insertions(+), 88 deletions(-) diff -Nru a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h --- a/drivers/char/agp/agp.h 2005-02-10 08:12:37 -08:00 +++ b/drivers/char/agp/agp.h 2005-02-10 08:12:37 -08:00 @@ -217,12 +217,6 @@ #ifndef PCI_DEVICE_ID_INTEL_915_G_1 #define PCI_DEVICE_ID_INTEL_915_G_1 0x2582 #endif -#ifndef PCI_DEVICE_ID_INTEL_915_GM_0 -#define PCI_DEVICE_ID_INTEL_915_GM_0 0x2590 -#endif -#ifndef PCI_DEVICE_ID_INTEL_915_GM_1 -#define PCI_DEVICE_ID_INTEL_915_GM_1 0x2592 -#endif #ifndef PCI_DEVICE_ID_INTEL_820_0 #define PCI_DEVICE_ID_INTEL_820_0 0x2500 #endif diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c --- a/drivers/char/agp/agpgart_be.c 2005-02-10 08:12:37 -08:00 +++ b/drivers/char/agp/agpgart_be.c 2005-02-10 08:12:37 -08:00 @@ -1170,14 +1170,14 @@ {128, 32768, 5}, /* The 64M mode still requires a 128k gatt */ {64, 16384, 5}, - /* For I915G/I915GM */ + /* For I915G */ {256, 65536, 6} }; static struct _intel_i830_private { struct pci_dev *i830_dev; /* device one */ volatile u8 *registers; - volatile u32 *gtt; /* I915G/I915GM */ + volatile u32 *gtt; /* I915G */ int gtt_entries; } intel_i830_private; @@ -1220,16 +1220,14 @@ break; case I915_GMCH_GMS_STOLEN_48M: /* Check it's really I915 */ - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) gtt_entries = MB(48) - KB(size); else gtt_entries = 0; break; case I915_GMCH_GMS_STOLEN_64M: /* Check it's really I915 */ - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) gtt_entries = MB(64) - KB(size); else gtt_entries = 0; @@ -1289,8 +1287,7 @@ num_entries = size->num_entries; agp_bridge.gatt_table_real = 0; - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) { + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) { pci_read_config_dword(intel_i830_private.i830_dev, I915_MMADDR,&temp); pci_read_config_dword(intel_i830_private.i830_dev, @@ -1334,8 +1331,7 @@ values = A_SIZE_FIX(agp_bridge.aperture_sizes); - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) { + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) { u32 temp, offset = 0; pci_read_config_dword(intel_i830_private.i830_dev, I915_GMADDR,&temp); @@ -1379,8 +1375,7 @@ current_size = A_SIZE_FIX(agp_bridge.current_size); - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) pci_read_config_dword(intel_i830_private.i830_dev, I915_GMADDR,&temp); else @@ -1397,8 +1392,7 @@ CACHE_FLUSH(); if (agp_bridge.needs_scratch_page == TRUE) { - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) { + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) { for (i = intel_i830_private.gtt_entries; i < current_size->num_entries; i++) OUTREG32(intel_i830_private.gtt, i, agp_bridge.scratch_page); } else { @@ -1412,8 +1406,7 @@ static void intel_i830_cleanup(void) { - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) iounmap((void *)intel_i830_private.gtt); iounmap((void *) intel_i830_private.registers); @@ -1448,8 +1441,7 @@ CACHE_FLUSH(); - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) { + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) { for (i = 0, j = pg_start; i < mem->page_count; i++, j++) OUTREG32(intel_i830_private.gtt, j, agp_bridge.mask_memory(mem->memory[i], mem->type)); } else { @@ -1475,8 +1467,7 @@ return (-EINVAL); } - if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0 || - agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_GM_0) { + if (agp_bridge.dev->device == PCI_DEVICE_ID_INTEL_915_G_0) { for (i = pg_start; i < (mem->page_count + pg_start); i++) OUTREG32(intel_i830_private.gtt, i, agp_bridge.scratch_page); } else { @@ -6279,13 +6270,6 @@ "915G", intel_845_setup }, - { PCI_DEVICE_ID_INTEL_915_GM_0, - PCI_VENDOR_ID_INTEL, - INTEL_I915_GM, - "Intel(R)", - "915GM", - intel_845_setup }, - { PCI_DEVICE_ID_INTEL_840_0, PCI_VENDOR_ID_INTEL, INTEL_I840, @@ -7034,33 +7018,6 @@ } printk(KERN_INFO PFX "Detected an Intel(R) " "915G Chipset.\n"); - agp_bridge.type = INTEL_I810; - return intel_i830_setup(i810_dev); - - case PCI_DEVICE_ID_INTEL_915_GM_0: - i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_915_GM_1, NULL); - if(i810_dev && PCI_FUNC(i810_dev->devfn) != 0) { - i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_915_GM_1, i810_dev); - } - - if (i810_dev == NULL) { - /* - * We probably have a 915GM chipset - * with an external graphics - * card. It will be initialized later - */ - printk(KERN_ERR PFX "Detected an " - "Intel(R) 915GM, but could not" - " find the" - " secondary device. Assuming a " - "non-integrated video card.\n"); - agp_bridge.type = INTEL_I915_GM; - break; - } - printk(KERN_INFO PFX "Detected an Intel(R) " - "915GM Chipset.\n"); agp_bridge.type = INTEL_I810; return intel_i830_setup(i810_dev); diff -Nru a/net/core/wireless.c b/net/core/wireless.c --- a/net/core/wireless.c 2005-02-10 08:12:37 -08:00 +++ b/net/core/wireless.c 2005-02-10 08:12:37 -08:00 @@ -310,7 +310,7 @@ /* ---------------------------------------------------------------- */ /* - * Calculate size of private arguments + * Number of private arguments */ static inline int get_priv_size(__u16 args) { @@ -320,24 +320,6 @@ return num * priv_type_size[type]; } -/* ---------------------------------------------------------------- */ -/* - * Re-calculate the size of private arguments - */ -static inline int adjust_priv_size(__u16 args, - union iwreq_data * wrqu) -{ - int num = wrqu->data.length; - int max = args & IW_PRIV_SIZE_MASK; - int type = (args & IW_PRIV_TYPE_MASK) >> 12; - - /* Make sure the driver doesn't goof up */ - if (max < num) - num = max; - - return num * priv_type_size[type]; -} - /******************** /proc/net/wireless SUPPORT ********************/ /* @@ -719,7 +701,7 @@ ((extra_size + offset) <= IFNAMSIZ)) extra_size = 0; } else { - /* Size of get arguments */ + /* Size of set arguments */ extra_size = get_priv_size(descr->get_args); /* Does it fits in iwr ? */ @@ -789,14 +771,6 @@ /* If we have something to return to the user */ if (!ret && IW_IS_GET(cmd)) { - - /* Adjust for the actual length if it's variable, - * avoid leaking kernel bits outside. */ - if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) { - extra_size = adjust_priv_size(descr->get_args, - &(iwr->u)); - } - err = copy_to_user(iwr->u.data.pointer, extra, extra_size); if (err)