From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org,
Johannes Berg <johannes@sipsolutions•net>,
"John W. Linville" <linville@tuxdriver•com>,
Alan Jenkins <alan-jenkins@tuffmail•co.uk>
Subject: linux-next: manual merge of the net tree with the wireless-current tree
Date: Thu, 30 Apr 2009 11:33:28 +1000 [thread overview]
Message-ID: <20090430113328.791e835e.sfr@canb.auug.org.au> (raw)
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;
}
next reply other threads:[~2009-04-30 1:33 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-30 1:33 Stephen Rothwell [this message]
2009-04-30 2:16 ` linux-next: manual merge of the net tree with the wireless-current tree John W. Linville
2009-04-30 3:23 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-09-27 2:51 Stephen Rothwell
2011-09-27 13:09 ` John W. Linville
2011-09-27 14:41 ` wwguy
2011-07-06 2:53 Stephen Rothwell
2011-07-06 11:07 ` Gustavo Padovan
2011-06-28 4:02 Stephen Rothwell
2011-06-28 14:57 ` Guy, Wey-Yi
2010-12-02 23:45 Stephen Rothwell
2010-05-12 2:15 Stephen Rothwell
2010-05-12 16:15 ` reinette chatre
2010-05-13 1:02 ` Stephen Rothwell
2010-03-30 2:37 Stephen Rothwell
2010-03-30 13:12 ` John W. Linville
2010-03-30 13:51 ` Stephen Rothwell
2010-02-15 4:20 Stephen Rothwell
2010-02-15 6:22 ` David Miller
2010-02-15 7:16 ` Stephen Rothwell
2010-02-09 2:24 Stephen Rothwell
2010-02-09 3:20 ` John W. Linville
2010-01-07 2:12 Stephen Rothwell
2010-01-06 2:25 Stephen Rothwell
2009-12-28 22:54 Stephen Rothwell
2009-12-28 23:41 ` John W. Linville
2009-12-01 1:31 Stephen Rothwell
2009-12-01 14:06 ` John W. Linville
2009-11-26 3:10 Stephen Rothwell
2009-11-26 9:33 ` Johannes Berg
2009-11-26 13:01 ` John W. Linville
2009-11-30 16:48 ` Jean Tourrilhes
2009-07-28 1:59 Stephen Rothwell
2009-07-28 1:53 Stephen Rothwell
2009-07-22 2:00 Stephen Rothwell
2009-07-22 14:03 ` John W. Linville
2009-07-22 1:59 Stephen Rothwell
2009-07-22 2:05 ` Zhu Yi
2009-07-22 4:50 ` Stephen Rothwell
2009-07-22 3:04 ` David Miller
2009-04-29 3:51 Stephen Rothwell
2009-04-29 12:42 ` John W. Linville
2009-04-29 13:24 ` Stephen Rothwell
2009-03-24 2:37 Stephen Rothwell
2009-03-06 3:55 Stephen Rothwell
2009-02-19 5:23 Stephen Rothwell
2009-02-19 5:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090430113328.791e835e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan-jenkins@tuffmail$(echo .)co.uk \
--cc=davem@davemloft$(echo .)net \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox