From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree Date: Wed, 29 Apr 2009 22:16:35 -0400 Message-ID: <20090430021635.GA17674@tuxdriver.com> References: <20090430113328.791e835e.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:56542 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751847AbZD3CbB (ORCPT ); Wed, 29 Apr 2009 22:31:01 -0400 Content-Disposition: inline In-Reply-To: <20090430113328.791e835e.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Miller , linux-next@vger.kernel.org, Johannes Berg , Alan Jenkins Yes, this looks correct -- please resolve the equivalent net-2.6 -> net-next-2.6 conflict this way too, Dave. Thanks, John On Thu, Apr 30, 2009 at 11:33:28AM +1000, Stephen Rothwell wrote: > Hi David, > > Today's linux-next merge of the net tree got a conflict in > net/mac80211/main.c between commit > d4c4a9a1bce1912ed5681251f0037fd4f2364a3e ("mac80211: fix modprobe > deadlock by not calling wep_init under rtnl_lock") from the > wireless-current tree and commit 10f644a47b76d3e61b98f2d02ce9690b94c51ee5 > ("mac80211: disable powersave if pm_qos asks for low latency") from the > net tree. > > Overlapping changes - in the latter patch, some unrelated whitespace > changes ... I fixed it up (see below) and can carry the fix as necessary. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc net/mac80211/main.c > index 1413419,5320e08..0000000 > --- a/net/mac80211/main.c > +++ b/net/mac80211/main.c > @@@ -752,12 -776,9 +776,10 @@@ struct ieee80211_hw *ieee80211_alloc_hw > /* set up some defaults */ > local->hw.queues = 1; > local->hw.max_rates = 1; > - local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD; > - local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD; > - local->hw.conf.long_frame_max_tx_count = 4; > - local->hw.conf.short_frame_max_tx_count = 7; > + local->hw.conf.long_frame_max_tx_count = wiphy->retry_long; > + local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; > local->hw.conf.radio_enabled = true; > + local->user_power_level = -1; > > INIT_LIST_HEAD(&local->interfaces); > mutex_init(&local->iflist_mtx); > @@@ -965,25 -1037,38 +1037,38 @@@ int ieee80211_register_hw(struct ieee80 > } > } > > + local->network_latency_notifier.notifier_call = > + ieee80211_max_network_latency; > + result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY, > + &local->network_latency_notifier); > + > + if (result) { > + rtnl_lock(); > + goto fail_pm_qos; > + } > + > return 0; > > - fail_rate: > + fail_pm_qos: > + ieee80211_led_exit(local); > + ieee80211_remove_interfaces(local); > - fail_wep: > - rate_control_deinitialize(local); > + fail_rate: > unregister_netdevice(local->mdev); > local->mdev = NULL; > - fail_dev: > + fail_dev: > rtnl_unlock(); > + ieee80211_wep_free(local); > - fail_wep: > ++ fail_wep: > sta_info_stop(local); > - fail_sta_info: > + fail_sta_info: > debugfs_hw_del(local); > destroy_workqueue(local->hw.workqueue); > - fail_workqueue: > + fail_workqueue: > if (local->mdev) > free_netdev(local->mdev); > - fail_mdev_alloc: > + fail_mdev_alloc: > wiphy_unregister(local->hw.wiphy); > - fail_wiphy_register: > + fail_wiphy_register: > kfree(local->int_scan_req.channels); > return result; > } > -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.