Skip to contentSkip to conversation

Please pull 'upstream-davem' branch of wireless-2.6

DISCUSSION Applied John W. Linville 2 participants 2 messages Aug 28, 2007 – Aug 29, 2007

lore
Share & tools
lore
#0 lore raw

Dave,

A passel of mac80211 patches for 2.6.24...

If you have already rebased, you can extract the series as:

master-davem..upstream-davem

Also, the individual patches are available here:

http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-davem/

And, of course, simply ask and I'll rebase on whatever is current when you get to my poor pull request. :-)

Thanks!

John

---

The following changes since commit e2eb35e4e38a2a861b99a75ed7643021fff66bf9:
Thomas Graf (1):
[ATM]: Fix build errors after conversion to pr_debug()

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem

Jiri Slaby (4):
Net: mac80211, remove bitfields from struct ieee80211_tx_packet_data
Net: mac80211, remove bitfields from struct ieee80211_txrx_data
Net: mac80211, remove bitfields from struct ieee80211_if_sta
Net: mac80211, remove bitfields from struct ieee80211_sub_if_data

Johannes Berg (27):
mac80211: avoid copying packets to interfaces that are down
mac80211: fix key debugfs
mac80211: remove reset callback
mac80211: remove IEEE80211_HW_HOST_GEN_BEACON flag
mac80211: remove PRISM2_PARAM_RADIO_ENABLED
mac80211: remove IEEE80211_HW_DATA_NULLFUNC_ACK
mac80211: ratelimit some RX messages
mac80211: remove ieee80211_msg_wep_frame_unknown_key
mac80211: remove radar stuff
mac80211: fix software decryption
mac80211: remove unused ioctls (1)
mac80211: remove unused ioctls (2)
mac80211: remove unused ioctls (3)
mac80211: kill key_mgmt, use key_management_enabled
mac80211: refactor event sending
mac80211: use switch statement in tx code
mac80211: embed key conf in key, fix driver interface
mac80211: remove krefs for keys
mac80211 key handling: remove default_wep_only
mac80211: remove fake set_key() call
mac80211: rework key handling
mac80211: add interface index to key debugfs
mac80211: fix preamble setting
mac80211: clean up whitespace
mac80211: improve key selection comment
mac80211: remove hostapd interface stuff
mac80211: make assoc_ap a flag

John W. Linville (1):
mac80211: filter locally-originated multicast frames

Larry Finger (1):
mac80211: Remove overly sticky averaging filters for rssi, signal, noise

 include/net/mac80211.h          |  185 +++++++++-------
 net/mac80211/Makefile           |    1 +
 net/mac80211/debugfs.c          |    9 -
 net/mac80211/debugfs_key.c      |   65 ++++--
 net/mac80211/debugfs_netdev.c   |   14 +-
 net/mac80211/debugfs_sta.c      |    1 -
 net/mac80211/event.c            |   42 ++++
 net/mac80211/hostapd_ioctl.h    |   38 ----
 net/mac80211/ieee80211.c        |  133 ++++--------
 net/mac80211/ieee80211_common.h |    4 +-
 net/mac80211/ieee80211_i.h      |  108 ++++-----
 net/mac80211/ieee80211_iface.c  |   33 +--
 net/mac80211/ieee80211_ioctl.c  |  460 +++++++--------------------------------
 net/mac80211/ieee80211_key.h    |   49 +++--
 net/mac80211/ieee80211_sta.c    |  134 +++++++-----
 net/mac80211/key.c              |  268 ++++++++++++++++++++---
 net/mac80211/rc80211_simple.c   |    8 -
 net/mac80211/rx.c               |  350 ++++++++++++++++-------------
 net/mac80211/sta_info.c         |   33 +---
 net/mac80211/sta_info.h         |   13 +-
 net/mac80211/tkip.c             |   18 +-
 net/mac80211/tx.c               |  131 ++++++-----
 net/mac80211/util.c             |    6 +-
 net/mac80211/wep.c              |   18 +-
 net/mac80211/wme.c              |   11 +-
 net/mac80211/wpa.c              |  107 ++++------
 26 files changed, 1065 insertions(+), 1174 deletions(-)
 create mode 100644 net/mac80211/event.c

Omnibus patch attached as upstream-davem.patch.bz2.

Signature · 2 lines
John W. Linville
[email protected]
Applied
#1 lore raw

From: "John W. Linville" <[email protected]>
Date: Tue, 28 Aug 2007 18:50:29 -0400

Quoted 2 lines

And, of course, simply ask and I'll rebase on whatever is current when you get to my poor pull request. :-)

You are perfect! You emailed this to me exactly when I pushed the rebased net-2.6.24 tree to master.kernel.org :-)

I applied everything as patches and pushed it out, thanks John.