Skip to contentSkip to conversation

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

DISCUSSION John W. Linville 3 participants 5 messages Oct 3, 2007 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The following changes since commit d3adbde754a9ae7a6f87612055cb20db856f0721:
Ilpo Järvinen (1):
[TCP]: Wrap-safed reordering detection FRTO check

are available in the git repository at:

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

Daniel Drake (1):
hostap: set netdev type before registering AP interface

Johannes Berg (9):
mac80211: add "invalid" interface type
mac80211: remove management interface
mac80211: move sta_process rx handler later
mac80211: consolidate decryption more
mac80211: use RX_FLAG_DECRYPTED for sw decrypted as well
mac80211: remove ALG_NONE
mac80211: improve radiotap injection
mac80211: make userspace-mlme a per-interface setting
mac80211: implement cfg80211's change_interface hook

Michael Buesch (9):
rfkill: Add support for an rfkill LED.
rfkill: Add support for hardware-only rfkill buttons
b43: LED triggers support
b43: RF-kill support
b43: Use input-polldev for the rfkill switch
b43: Rewrite pwork locking policy.
mac80211: Check open_count before calling config callback.
mac80211: Add association LED trigger
mac80211: Update beacon_update callback documentation

Tomas Winkler (1):
mac80211: add sta_notify callback

Ulrich Kunitz (1):
zd1211rw: Removed zd_util.c and zd_util.h

 Documentation/networking/mac80211-injection.txt |   32 ++-
 drivers/net/wireless/adm8211.c                  |    8 +-
 drivers/net/wireless/b43/Kconfig                |   12 +
 drivers/net/wireless/b43/Makefile               |    5 +-
 drivers/net/wireless/b43/b43.h                  |   11 +-
 drivers/net/wireless/b43/leds.c                 |  399 ++++++++++-------------
 drivers/net/wireless/b43/leds.h                 |   63 ++--
 drivers/net/wireless/b43/main.c                 |  205 ++++--------
 drivers/net/wireless/b43/phy.c                  |   13 +-
 drivers/net/wireless/b43/phy.h                  |    2 +-
 drivers/net/wireless/b43/rfkill.c               |  184 +++++++++++
 drivers/net/wireless/b43/rfkill.h               |   58 ++++
 drivers/net/wireless/hostap/hostap.h            |    2 +-
 drivers/net/wireless/hostap/hostap_hw.c         |    2 +-
 drivers/net/wireless/hostap/hostap_main.c       |   19 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c     |    4 -
 drivers/net/wireless/iwlwifi/iwl4965-base.c     |    4 -
 drivers/net/wireless/p54common.c                |    4 +-
 drivers/net/wireless/p54pci.c                   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h            |    2 +-
 drivers/net/wireless/zd1211rw/Makefile          |    2 +-
 drivers/net/wireless/zd1211rw/zd_chip.c         |    1 -
 drivers/net/wireless/zd1211rw/zd_mac.c          |    4 +-
 drivers/net/wireless/zd1211rw/zd_usb.c          |    1 -
 drivers/net/wireless/zd1211rw/zd_util.c         |   82 -----
 drivers/net/wireless/zd1211rw/zd_util.h         |   29 --
 include/linux/rfkill.h                          |   24 ++
 include/net/mac80211.h                          |   46 +++-
 net/mac80211/cfg.c                              |   75 ++++-
 net/mac80211/ieee80211.c                        |  189 +-----------
 net/mac80211/ieee80211_i.h                      |   17 +-
 net/mac80211/ieee80211_iface.c                  |   68 +----
 net/mac80211/ieee80211_ioctl.c                  |   31 +-
 net/mac80211/ieee80211_led.c                    |   67 +++-
 net/mac80211/ieee80211_led.h                    |    6 +
 net/mac80211/ieee80211_rate.c                   |    3 +-
 net/mac80211/ieee80211_rate.h                   |    2 -
 net/mac80211/ieee80211_sta.c                    |    7 +-
 net/mac80211/key.c                              |    1 -
 net/mac80211/rx.c                               |  122 +++-----
 net/mac80211/sta_info.c                         |   13 +-
 net/mac80211/tx.c                               |  211 ++++++------
 net/mac80211/wme.c                              |   10 +-
 net/rfkill/Kconfig                              |    7 +
 net/rfkill/rfkill.c                             |   49 +++-
 45 files changed, 1022 insertions(+), 1078 deletions(-)
 create mode 100644 drivers/net/wireless/b43/rfkill.c
 create mode 100644 drivers/net/wireless/b43/rfkill.h
 delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.c
 delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.h

Omnibus patch attached as upstream-davem.patch.bz2

Signature · 2 lines
John W. Linville
[email protected]
#2 lore raw
In reply to a message not in the archive

Of course, these are intended for 2.6.24. Also, I forgot to mention that the individual patches are available here:

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

I also preserved the net-2.6.24 commit I based from as 'master-davem' in case you need it for reference.

Hth!

John

Quoted 91 lines · John W. Linville

The following changes since commit d3adbde754a9ae7a6f87612055cb20db856f0721:
Ilpo Järvinen (1):
[TCP]: Wrap-safed reordering detection FRTO check

are available in the git repository at:

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

Daniel Drake (1):
hostap: set netdev type before registering AP interface

Johannes Berg (9):
mac80211: add "invalid" interface type
mac80211: remove management interface
mac80211: move sta_process rx handler later
mac80211: consolidate decryption more
mac80211: use RX_FLAG_DECRYPTED for sw decrypted as well
mac80211: remove ALG_NONE
mac80211: improve radiotap injection
mac80211: make userspace-mlme a per-interface setting
mac80211: implement cfg80211's change_interface hook

Michael Buesch (9):
rfkill: Add support for an rfkill LED.
rfkill: Add support for hardware-only rfkill buttons
b43: LED triggers support
b43: RF-kill support
b43: Use input-polldev for the rfkill switch
b43: Rewrite pwork locking policy.
mac80211: Check open_count before calling config callback.
mac80211: Add association LED trigger
mac80211: Update beacon_update callback documentation

Tomas Winkler (1):
mac80211: add sta_notify callback

Ulrich Kunitz (1):
zd1211rw: Removed zd_util.c and zd_util.h

 Documentation/networking/mac80211-injection.txt |   32 ++-
 drivers/net/wireless/adm8211.c                  |    8 +-
 drivers/net/wireless/b43/Kconfig                |   12 +
 drivers/net/wireless/b43/Makefile               |    5 +-
 drivers/net/wireless/b43/b43.h                  |   11 +-
 drivers/net/wireless/b43/leds.c                 |  399 ++++++++++-------------
 drivers/net/wireless/b43/leds.h                 |   63 ++--
 drivers/net/wireless/b43/main.c                 |  205 ++++--------
 drivers/net/wireless/b43/phy.c                  |   13 +-
 drivers/net/wireless/b43/phy.h                  |    2 +-
 drivers/net/wireless/b43/rfkill.c               |  184 +++++++++++
 drivers/net/wireless/b43/rfkill.h               |   58 ++++
 drivers/net/wireless/hostap/hostap.h            |    2 +-
 drivers/net/wireless/hostap/hostap_hw.c         |    2 +-
 drivers/net/wireless/hostap/hostap_main.c       |   19 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c     |    4 -
 drivers/net/wireless/iwlwifi/iwl4965-base.c     |    4 -
 drivers/net/wireless/p54common.c                |    4 +-
 drivers/net/wireless/p54pci.c                   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h            |    2 +-
 drivers/net/wireless/zd1211rw/Makefile          |    2 +-
 drivers/net/wireless/zd1211rw/zd_chip.c         |    1 -
 drivers/net/wireless/zd1211rw/zd_mac.c          |    4 +-
 drivers/net/wireless/zd1211rw/zd_usb.c          |    1 -
 drivers/net/wireless/zd1211rw/zd_util.c         |   82 -----
 drivers/net/wireless/zd1211rw/zd_util.h         |   29 --
 include/linux/rfkill.h                          |   24 ++
 include/net/mac80211.h                          |   46 +++-
 net/mac80211/cfg.c                              |   75 ++++-
 net/mac80211/ieee80211.c                        |  189 +-----------
 net/mac80211/ieee80211_i.h                      |   17 +-
 net/mac80211/ieee80211_iface.c                  |   68 +----
 net/mac80211/ieee80211_ioctl.c                  |   31 +-
 net/mac80211/ieee80211_led.c                    |   67 +++-
 net/mac80211/ieee80211_led.h                    |    6 +
 net/mac80211/ieee80211_rate.c                   |    3 +-
 net/mac80211/ieee80211_rate.h                   |    2 -
 net/mac80211/ieee80211_sta.c                    |    7 +-
 net/mac80211/key.c                              |    1 -
 net/mac80211/rx.c                               |  122 +++-----
 net/mac80211/sta_info.c                         |   13 +-
 net/mac80211/tx.c                               |  211 ++++++------
 net/mac80211/wme.c                              |   10 +-
 net/rfkill/Kconfig                              |    7 +
 net/rfkill/rfkill.c                             |   49 +++-
 45 files changed, 1022 insertions(+), 1078 deletions(-)
 create mode 100644 drivers/net/wireless/b43/rfkill.c
 create mode 100644 drivers/net/wireless/b43/rfkill.h
 delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.c
 delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.h

Omnibus patch attached as upstream-davem.patch.bz2

Signature · 2 lines
John W. Linville
[email protected]
#3 lore raw
In reply to a message not in the archive

From: "John W. Linville" <[email protected]>
Date: Tue, 2 Oct 2007 21:25:52 -0400

Quoted 1 line

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

This doesn't pull cleanly.

Probably you used a recently cloned Linus tree, pulled net-2.6.24 into that (and resolved the conflicts), and then put your patches in.

Please don't do it like that, I don't want to pull from a tree that has linus vs. net-2.6.24 conflict handling in it. That's why I usually rebase frequently, to minimize that as much as is humanly possible.

What you can do is figure out what linus's HEAD was at the last rebase (basically 'origin' or parent of net-2.6.24), clone that then pull in net-2.6.24, then add your patches.

That way I can always do a clean pull.

My pull from Jeff today was very clean, for example.

I'll add these wireless bits by hand as patches.

Thanks John.

#5 lore raw
In reply to a message not in the archive
Quoted 10 lines · David Miller

From: "John W. Linville" <[email protected]>
Date: Tue, 2 Oct 2007 21:25:52 -0400

Quoted 1 line

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

This doesn't pull cleanly.

Probably you used a recently cloned Linus tree, pulled net-2.6.24 into that (and resolved the conflicts), and then put your patches in.

No, in fact I'm quite conscious of that. I follow a procedure identical to what you outlined. I even leave my 'master-davem' branch available as a reference, and create the initial 'upstream-davem' branch as a checkout from it. :-)

As an experiment, I cloned your current tree (which has the patches applied already, thanks!) and created a branch which backed-out the patches from me you had already applied by hand. I then did a pull from my tree, and the results were quite clean.

[linville]:> git checkout -b jwltest fc26d79bb258b5fdb3dee940bea12d6ef7c217c5 Switched to a new branch "jwltest"

[linville]:> git pull git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem
remote: Generating pack...
remote: Done counting 257 objects.
remote: Result has 199 objects.
remote: Deltifying 199 objects...
remote: 100% (199/199) done
Indexing 199 objects...
remote: Total 199 (delta 150), reused 143 (delta 115)
100% (199/199) done
Resolving 150 deltas...
100% (150/150) done
32 objects were added to complete this thin pack.
Removed drivers/net/wireless/zd1211rw/zd_util.c
Removed drivers/net/wireless/zd1211rw/zd_util.h
Merge made by recursive.
Documentation/networking/mac80211-injection.txt | 32 ++-
drivers/net/wireless/adm8211.c | 8 +-
drivers/net/wireless/b43/Kconfig | 12 +
drivers/net/wireless/b43/Makefile | 5 +-
drivers/net/wireless/b43/b43.h | 11 +-
drivers/net/wireless/b43/leds.c | 399 ++++++++++-------------
drivers/net/wireless/b43/leds.h | 63 ++--
drivers/net/wireless/b43/main.c | 205 ++++--------
drivers/net/wireless/b43/phy.c | 13 +-
drivers/net/wireless/b43/phy.h | 2 +-
drivers/net/wireless/b43/rfkill.c | 184 +++++++++++
drivers/net/wireless/b43/rfkill.h | 58 ++++
drivers/net/wireless/hostap/hostap.h | 2 +-
drivers/net/wireless/hostap/hostap_hw.c | 2 +-
drivers/net/wireless/hostap/hostap_main.c | 19 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 -
drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 -
drivers/net/wireless/p54common.c | 4 +-
drivers/net/wireless/p54pci.c | 4 +-
drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
drivers/net/wireless/zd1211rw/Makefile | 2 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 1 -
drivers/net/wireless/zd1211rw/zd_mac.c | 4 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 1 -
drivers/net/wireless/zd1211rw/zd_util.c | 82 -----
drivers/net/wireless/zd1211rw/zd_util.h | 29 --
include/linux/rfkill.h | 24 ++
include/net/mac80211.h | 46 +++-
net/mac80211/cfg.c | 75 ++++-
net/mac80211/ieee80211.c | 189 +-----------
net/mac80211/ieee80211_i.h | 17 +-
net/mac80211/ieee80211_iface.c | 68 +----
net/mac80211/ieee80211_ioctl.c | 31 +-
net/mac80211/ieee80211_led.c | 67 +++-
net/mac80211/ieee80211_led.h | 6 +
net/mac80211/ieee80211_rate.c | 3 +-
net/mac80211/ieee80211_rate.h | 2 -
net/mac80211/ieee80211_sta.c | 7 +-
net/mac80211/key.c | 1 -
net/mac80211/rx.c | 122 +++-----
net/mac80211/sta_info.c | 13 +-
net/mac80211/tx.c | 211 ++++++------
net/mac80211/wme.c | 10 +-
net/rfkill/Kconfig | 7 +
net/rfkill/rfkill.c | 49 +++-
45 files changed, 1022 insertions(+), 1078 deletions(-)
create mode 100644 drivers/net/wireless/b43/rfkill.c
create mode 100644 drivers/net/wireless/b43/rfkill.h
delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.c
delete mode 100644 drivers/net/wireless/zd1211rw/zd_util.h

So I'm not sure what happened for you. But I think it must have been some other anomaly.

Anyway, I'm sorry it wasn't as smooth as usual. Thanks for the manual patch work!

John

Signature · 2 lines
John W. Linville
[email protected]