John W. Linville wrote:
This branch includes the 'upstream-fixes' branch as well.
I presume that you will have already pulled 'upstream-fixes' both
to the netdev-2.6 'upstream-fixes' branch as well as the netdev-2.6
'upstream' branch.

This pull request is intended for the 'upstream' branch of netdev-2.6.

---

The following changes since commit 4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6:
  Zhu Yi:
        ieee80211: Fix A band min and max channel definitions

are found in the git repository at:

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

Denis Vlasenko:
      WEP fields are incorrectly shown to be INSIDE snap in the doc

Zhu Yi:
      ieee80211: Log if netif_rx() drops the packet
      ieee80211: Add LEAP authentication type
      ieee80211: add flags for all geo channels
      ieee80211: Add spectrum management information
      ieee80211: kmalloc+memset -> kzalloc cleanups
      ieee80211: TIM information element parsing
      ieee80211: Add TKIP crypt->build_iv
      ieee80211: Add 802.11h data type and structures
      ieee80211: Add helpers for IBSS DFS handling
      ieee80211: Add 802.11h information element parsing

 include/net/ieee80211.h              |  169 +++++++++++++++++++++++++++++++++-
 include/net/ieee80211_crypt.h        |    3 -
 net/ieee80211/ieee80211_crypt.c      |   11 +-
 net/ieee80211/ieee80211_crypt_ccmp.c |    8 +-
 net/ieee80211/ieee80211_crypt_tkip.c |   56 ++++++-----
 net/ieee80211/ieee80211_crypt_wep.c  |    5 +
 net/ieee80211/ieee80211_geo.c        |   39 ++++++++
 net/ieee80211/ieee80211_module.c     |   18 ++++
 net/ieee80211/ieee80211_rx.c         |  123 +++++++++++++++++++++++--
 net/ieee80211/ieee80211_tx.c         |   30 +++---
 net/ieee80211/ieee80211_wx.c         |   31 ++++++
 11 files changed, 426 insertions(+), 67 deletions(-)

pulled, thanks


-
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

Reply via email to