Jeff Garzik wrote: > Jiri Benc wrote: > >> Our patches against latest ieee80211 branch can be found at >> http://kernel.org/pub/linux/kernel/people/jbenc/ > > Thanks for your patience. > > To answer Pavel's question from the other email: > > I was hoping that Intel would resend their patches, rediffed to the > latest ieee80211 branch. I didn't want to apply all these cleanups, > which would then force Intel to rediff _yet again_.
When it rains it pours it seems... we finally had the time to split up the commit Jiri originally asked us to split up; in doing so we rebased the commit series against netdev-2.6#ieee80211 as of Aug 15th (commit 1b5cca3a88b7682d538d129c25f0e3092613a243) When we rebased, the first commit was a run scripts/Lindent and trimmed all trailing whitespace on include/net/ieee80211*.h and net/ieee80211/*.c. This makes the first patch in the series large, but it is purely a Lindent patch. Running it as the first step in the rebase helped resolve any conflicts later (if you're interested in the 'clean-rebase' script it will apply non Lindent'd patches back into a Lindented tree without Lindent caused conflicts). Anyway, our rebasing from ieee80211 up to the latest development tip is done across 29 commits, with a series size of 225k. We have an updated GIT overlay of the rebased ieee80211 at rsync://bughost.org/repos/ieee80211-rebase/.git/. If you just want to pull the objects/ tree, you can walk it via the commit 69b08411732dfc5a028ef19fc6c79b84302c4c30. NOTE: The GIT overlay referenced here is not a full archive. It only contains the objects required to move from the parent (netdev-2.6#ieee80211) to the master. Once pulled you can use many of the git commands, but others (like checkout) will likely fail. We are willing to keep a ieee80211 GIT tree up to date w/ everyone's patches that you can just periodically pull from if you'd like. We already have to maintain a separate tree anyway to enable updates and snapshots for the ipw2{1,2}00 project users. This is partially what is causing us pain right now; any set of patches we apply may later end up being conflicts when we try and merge back with netdev -- which means the merge rarely occurs. At the same time, we can't always wait for a patch to be incorporated into netdev-2.6#ieee80211 before we make it available to users. Anyway, here is the shortlist of the changes we have for ieee80211, available from the above rsync location. (As a side note, we're working on a similar set for the ipw2{1,2}00 drivers that catch them up to being compatible with this version of ieee80211, etc. That series is 52 patches, breaking in at just over 1M.) James --- cg-diff -r parent:master | diffstat -p1 --- include/net/ieee80211.h | 474 ++++++++++++++++------ include/net/ieee80211_crypt.h | 46 +- include/net/ieee80211_radiotap.h | 237 +++++++++++ net/ieee80211/ieee80211_crypt.c | 86 ++-- net/ieee80211/ieee80211_crypt_ccmp.c | 79 +-- net/ieee80211/ieee80211_crypt_tkip.c | 163 +++---- net/ieee80211/ieee80211_crypt_wep.c | 52 -- net/ieee80211/ieee80211_geo.c | 141 ++++++ net/ieee80211/ieee80211_module.c | 90 ++-- net/ieee80211/ieee80211_rx.c | 751 +++++++++++++++++++++++++---------- net/ieee80211/ieee80211_tx.c | 332 ++++++++++----- net/ieee80211/ieee80211_wx.c | 393 ++++++++++++++---- 12 files changed, 2092 insertions(+), 752 deletions(-) --- git --pretty=short parent..master | git shortlog --- Ivo van Doorn: This patch adds support for the creation of RTS packets when the James Ketrenos: Ran scripts/Lindent on ieee80211 files. Fixed some endian issues with 802.11 header usage in ieee80211_rx.c Incorporated Bill Moss' quality scaling algorithm into default wireless Added wireless spy support to Rx code path. Fixed a kernel oops on module unload by adding spin lock protection to Changed 802.11 headers to use ieee80211_info_element as zero sized Removed ieee80211_info_element_hdr structure as ieee80211_info_element Hardware crypto and fragmentation offload support added (Zhu Yi) Switched to sscanf as per friendly comment in store_debug_level. Fixed type-o of abg_ture -> abg_true. Renamed ieee80211_hdr to ieee80211_hdr_3addr and modified ieee80211_hdr Fixed a stray struct ieee80211_hdr usage. Added definitions of several information element IDs and the short_slot Added ieee80211_tx_frame to convert generic 802.11 data frames into Per the conversations with folks at OLS, the QoS layer in 802.11 Added ieee80211_geo to provide helper functions to drivers for Updated misc. copyright dates. Removed some #define WLAN_* constants that were previously removed but Update version ieee80211 stamp to 1.1.4-pre6 Liu Hong: Added WE-18 support to default wireless extension handler in ieee80211 This patch fixes several things: Mike Kershaw: Added ieee80211_radiotap.h to enhance statistic reporting to user space Mohamed Abbas: Add QoS (WME) support to the ieee80211 subsystem. Pedro Ramalhais: Fixed 64-bit compilation warning. Zhu Yi: Cleanup memcpy parameters. Fix time calculation. HZ is 1000 on 2.6 i386 kernel, but we don't Fix kernel Oops when module unload. Allow drivers to fix an issue when using wpa_supplicant with WEP. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html