From: Greg Kroah-Hartman Date: Fri, 1 Jun 2012 07:00:03 +0000 (+0800) Subject: remove net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci... X-Git-Tag: v3.0.33~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21d798e165acb8780d62f3c072fee68e7f221f1f;p=thirdparty%2Fkernel%2Fstable-queue.git remove net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch From both the 3.3 and 3.4 queues --- diff --git a/queue-3.3/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch b/queue-3.3/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch deleted file mode 100644 index b920db2cf30..00000000000 --- a/queue-3.3/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7ed85b65ab611ba841d508ae4ff8c45fa0c48c80 Mon Sep 17 00:00:00 2001 -From: Stanislav Yakovlev -Date: Mon, 16 Apr 2012 06:38:30 -0400 -Subject: net/wireless: ipw2200: Fix WARN_ON occurring in wiphy_register called by ipw_pci_probe - -From: Stanislav Yakovlev - -commit 7ed85b65ab611ba841d508ae4ff8c45fa0c48c80 upstream. - -The problem was found by Stefan Lippers-Hollmann -http://marc.info/?l=linux-wireless&m=132720334512946&w=2 - -WARNING: at /tmp/buildd/linux-aptosid-3.2/debian/build/source_i386_none/net/wireless/core.c:562 wiphy_register+0x45/0x38d [cfg80211]() -Hardware name: TravelMate 290 \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff -Modules linked in: ipw2200(+) iTCO_wdt libipw joydev drm snd_seq snd_timer snd_seq_device iTCO_vendor_support yenta_socket snd intel_agp i2c_i801 pcmcia_rsrc cfg80211 soundcore parport_pc psmouse parport rng_core snd_page_alloc serio_raw pcspkr i2c_algo_bit intel_gtt pcmcia_core evdev irda crc_ccitt rfkill lib80211 processor container ac battery shpchp pci_hotplug button ext4 mbcache jbd2 crc16 dm_mod sd_mod sr_mod crc_t10dif cdrom ata_generic pata_acpi ata_piix libata scsi_mod firewire_ohci firewire_core crc_itu_t 8139too 8139cp mii uhci_hcd ehci_hcd usbcore usb_common [last unloaded: scsi_wait_scan] -Pid: 328, comm: modprobe Not tainted 3.2-1.slh.4-aptosid-686 #1 -Call Trace: -[] ? warn_slowpath_common+0x7c/0x8f -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? warn_slowpath_null+0x1b/0x1f -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? internal_create_group+0xf5/0xff -[] ? ipw_pci_probe+0xa9a/0xbd0 [ipw2200] -[] ? arch_local_irq_save+0xf/0x14 -[] ? pci_device_probe+0x53/0x9a -[] ? driver_probe_device+0x94/0x124 -[] ? pci_match_id+0x15/0x34 -[] ? __driver_attach+0x40/0x5b -[] ? bus_for_each_dev+0x37/0x60 -[] ? driver_attach+0x17/0x1a -[] ? driver_probe_device+0x124/0x124 -[] ? bus_add_driver+0x92/0x1d1 -[] ? 0xe099cfff -[] ? driver_register+0x7d/0xd4 -[] ? jump_label_module_notify+0xec/0x167 -[] ? 0xe099cfff -[] ? __pci_register_driver+0x32/0x87 -[] ? 0xe099cfff -[] ? ipw_init+0x2e/0x72 [ipw2200] -[] ? do_one_initcall+0x7d/0x132 -[] ? __blocking_notifier_call_chain+0x47/0x4f -[] ? sys_init_module+0x13a4/0x159c -[] ? sysenter_do_call+0x12/0x28 - -This warning appears only if we apply Ben Hutchings' fix -http://marc.info/?l=linux-wireless&m=132720195012653&w=2 -for the bug reported by Cesare Leonardi -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656813 -with cfg80211 warning during device registration -("cfg80211: failed to add phy80211 symlink to netdev!"). - -We separate device bring up and registration with network stack -to avoid the problem. - -After that Ben Hutchings' fix can be applied to fix the bug. - -Signed-off-by: Stanislav Yakovlev -Tested-by: Stefan Lippers-Hollmann -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/ipw2x00/ipw2200.c | 21 ++++++--------------- - 1 file changed, 6 insertions(+), 15 deletions(-) - ---- a/drivers/net/wireless/ipw2x00/ipw2200.c -+++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11443,20 +11443,6 @@ static void ipw_bg_down(struct work_stru - mutex_unlock(&priv->mutex); - } - --/* Called by register_netdev() */ --static int ipw_net_init(struct net_device *dev) --{ -- int rc = 0; -- struct ipw_priv *priv = libipw_priv(dev); -- -- mutex_lock(&priv->mutex); -- if (ipw_up(priv)) -- rc = -EIO; -- mutex_unlock(&priv->mutex); -- -- return rc; --} -- - static int ipw_wdev_init(struct net_device *dev) - { - int i, rc = 0; -@@ -11722,7 +11708,6 @@ static void ipw_prom_free(struct ipw_pri - #endif - - static const struct net_device_ops ipw_netdev_ops = { -- .ndo_init = ipw_net_init, - .ndo_open = ipw_net_open, - .ndo_stop = ipw_net_stop, - .ndo_set_rx_mode = ipw_net_set_multicast_list, -@@ -11849,6 +11834,12 @@ static int __devinit ipw_pci_probe(struc - goto out_release_irq; - } - -+ if (ipw_up(priv)) { -+ mutex_unlock(&priv->mutex); -+ err = -EIO; -+ goto out_remove_sysfs; -+ } -+ - mutex_unlock(&priv->mutex); - err = register_netdev(net_dev); - if (err) { diff --git a/queue-3.3/series b/queue-3.3/series index 31b894d7a2c..57692a47f8c 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -9,7 +9,6 @@ isdn-gigaset-ratelimit-capi-message-dumps.patch vfs-make-aio-use-the-proper-rw_verify_area-area-helpers.patch iwlwifi-use-6000g2b-for-6030-device-series.patch iwlwifi-use-correct-released-ucode-version.patch -net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch cfg80211-warn-if-db.txt-is-empty-with-config_cfg80211_internal_regdb.patch regulator-core-release-regulator-regulator-supplies-on-error.patch fix-blocking-allocations-called-very-early-during-bootup.patch diff --git a/queue-3.4/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch b/queue-3.4/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch deleted file mode 100644 index b920db2cf30..00000000000 --- a/queue-3.4/net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7ed85b65ab611ba841d508ae4ff8c45fa0c48c80 Mon Sep 17 00:00:00 2001 -From: Stanislav Yakovlev -Date: Mon, 16 Apr 2012 06:38:30 -0400 -Subject: net/wireless: ipw2200: Fix WARN_ON occurring in wiphy_register called by ipw_pci_probe - -From: Stanislav Yakovlev - -commit 7ed85b65ab611ba841d508ae4ff8c45fa0c48c80 upstream. - -The problem was found by Stefan Lippers-Hollmann -http://marc.info/?l=linux-wireless&m=132720334512946&w=2 - -WARNING: at /tmp/buildd/linux-aptosid-3.2/debian/build/source_i386_none/net/wireless/core.c:562 wiphy_register+0x45/0x38d [cfg80211]() -Hardware name: TravelMate 290 \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff -Modules linked in: ipw2200(+) iTCO_wdt libipw joydev drm snd_seq snd_timer snd_seq_device iTCO_vendor_support yenta_socket snd intel_agp i2c_i801 pcmcia_rsrc cfg80211 soundcore parport_pc psmouse parport rng_core snd_page_alloc serio_raw pcspkr i2c_algo_bit intel_gtt pcmcia_core evdev irda crc_ccitt rfkill lib80211 processor container ac battery shpchp pci_hotplug button ext4 mbcache jbd2 crc16 dm_mod sd_mod sr_mod crc_t10dif cdrom ata_generic pata_acpi ata_piix libata scsi_mod firewire_ohci firewire_core crc_itu_t 8139too 8139cp mii uhci_hcd ehci_hcd usbcore usb_common [last unloaded: scsi_wait_scan] -Pid: 328, comm: modprobe Not tainted 3.2-1.slh.4-aptosid-686 #1 -Call Trace: -[] ? warn_slowpath_common+0x7c/0x8f -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? warn_slowpath_null+0x1b/0x1f -[] ? wiphy_register+0x45/0x38d [cfg80211] -[] ? internal_create_group+0xf5/0xff -[] ? ipw_pci_probe+0xa9a/0xbd0 [ipw2200] -[] ? arch_local_irq_save+0xf/0x14 -[] ? pci_device_probe+0x53/0x9a -[] ? driver_probe_device+0x94/0x124 -[] ? pci_match_id+0x15/0x34 -[] ? __driver_attach+0x40/0x5b -[] ? bus_for_each_dev+0x37/0x60 -[] ? driver_attach+0x17/0x1a -[] ? driver_probe_device+0x124/0x124 -[] ? bus_add_driver+0x92/0x1d1 -[] ? 0xe099cfff -[] ? driver_register+0x7d/0xd4 -[] ? jump_label_module_notify+0xec/0x167 -[] ? 0xe099cfff -[] ? __pci_register_driver+0x32/0x87 -[] ? 0xe099cfff -[] ? ipw_init+0x2e/0x72 [ipw2200] -[] ? do_one_initcall+0x7d/0x132 -[] ? __blocking_notifier_call_chain+0x47/0x4f -[] ? sys_init_module+0x13a4/0x159c -[] ? sysenter_do_call+0x12/0x28 - -This warning appears only if we apply Ben Hutchings' fix -http://marc.info/?l=linux-wireless&m=132720195012653&w=2 -for the bug reported by Cesare Leonardi -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656813 -with cfg80211 warning during device registration -("cfg80211: failed to add phy80211 symlink to netdev!"). - -We separate device bring up and registration with network stack -to avoid the problem. - -After that Ben Hutchings' fix can be applied to fix the bug. - -Signed-off-by: Stanislav Yakovlev -Tested-by: Stefan Lippers-Hollmann -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/ipw2x00/ipw2200.c | 21 ++++++--------------- - 1 file changed, 6 insertions(+), 15 deletions(-) - ---- a/drivers/net/wireless/ipw2x00/ipw2200.c -+++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11443,20 +11443,6 @@ static void ipw_bg_down(struct work_stru - mutex_unlock(&priv->mutex); - } - --/* Called by register_netdev() */ --static int ipw_net_init(struct net_device *dev) --{ -- int rc = 0; -- struct ipw_priv *priv = libipw_priv(dev); -- -- mutex_lock(&priv->mutex); -- if (ipw_up(priv)) -- rc = -EIO; -- mutex_unlock(&priv->mutex); -- -- return rc; --} -- - static int ipw_wdev_init(struct net_device *dev) - { - int i, rc = 0; -@@ -11722,7 +11708,6 @@ static void ipw_prom_free(struct ipw_pri - #endif - - static const struct net_device_ops ipw_netdev_ops = { -- .ndo_init = ipw_net_init, - .ndo_open = ipw_net_open, - .ndo_stop = ipw_net_stop, - .ndo_set_rx_mode = ipw_net_set_multicast_list, -@@ -11849,6 +11834,12 @@ static int __devinit ipw_pci_probe(struc - goto out_release_irq; - } - -+ if (ipw_up(priv)) { -+ mutex_unlock(&priv->mutex); -+ err = -EIO; -+ goto out_remove_sysfs; -+ } -+ - mutex_unlock(&priv->mutex); - err = register_netdev(net_dev); - if (err) { diff --git a/queue-3.4/series b/queue-3.4/series index 952e6a4d68e..6e8cf237a40 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -4,7 +4,6 @@ isdn-gigaset-improve-error-handling-querying-firmware-version.patch vfs-make-aio-use-the-proper-rw_verify_area-area-helpers.patch iwlwifi-use-6000g2b-for-6030-device-series.patch iwlwifi-use-correct-released-ucode-version.patch -net-wireless-ipw2200-fix-warn_on-occurring-in-wiphy_register-called-by-ipw_pci_probe.patch cfg80211-warn-if-db.txt-is-empty-with-config_cfg80211_internal_regdb.patch regulator-core-release-regulator-regulator-supplies-on-error.patch fix-blocking-allocations-called-very-early-during-bootup.patch