Skip to content
Commits on Mar 28, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (166 commits)
      Revert "ax25: zero length frame filtering in AX25"
      Revert "netrom: zero length frame filtering in NetRom"
      cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n
      mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi
      mac80211: fix aggregation to not require queue stop
      mac80211: add skb length sanity checking
      mac80211: unify and fix TX aggregation start
      mac80211: clean up __ieee80211_tx args
      mac80211: rework the pending packets code
      mac80211: fix A-MPDU queue assignment
      mac80211: rewrite fragmentation
      iwlwifi: show current driver status in user readable format
      b43: Add BCM4307 PCI-ID
      cfg80211: fix locking in nl80211_set_wiphy
      mac80211: fix RX path
      ath5k: properly drop packets from ops->tx
      ar9170: single module build
      ath9k: fix dma mapping leak of rx buffer upon rmmod
      rt2x00: New USB ID for rt73usb
      ath5k: warn and correct rate for unknown hw rate indexes
      ...
    torvalds committed Mar 27, 2009
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: We need to use compat_sys_ustat() as well.
      sparc64: Fix MM refcount check in smp_flush_tlb_pending().
    torvalds committed Mar 27, 2009
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (53 commits)
      DVB: firedtv: FireDTV S2 problems with tuning solved
      DVB: firedtv: fix printk format mismatch
      ieee1394: constify device ID tables
      ieee1394: raw1394: add sparse annotations to raw1394_compat_write
      ieee1394: Storage class should be before const qualifier
      ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id"
      firewire: core: optimize propagation of BROADCAST_CHANNEL
      firewire: core: simplify broadcast channel allocation
      firewire: core: increase bus manager grace period
      firewire: core: drop unused call parameters of close_transaction
      firewire: cdev: add closure to async stream ioctl
      firewire: cdev: simplify FW_CDEV_IOC_SEND_REQUEST return value
      firewire: cdev: fix race of ioctl_send_request with bus reset
      firewire: cdev: secure add_descriptor ioctl
      firewire: cdev: amendment to "add ioctl to query maximum transmission speed"
      firewire: broadcast channel support
      firewire: implement asynchronous stream transmission
      firewire: core: normalize a function argument name
      firewire: normalize a variable name
      firewire: core: remove condition which is always false
      ...
    torvalds committed Mar 27, 2009
  4. @davem330

    sparc64: We need to use compat_sys_ustat() as well.

    Sparc was missed in commit 2b1c6bd
    ("generic compat_sys_ustat").  We definitely need it, since our
    __kernel_ino_t is "unsigned long".
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 27, 2009
  5. @davem330

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/linville/wireless-2.6
    davem330 committed Mar 27, 2009
  6. @davem330

    Revert "ax25: zero length frame filtering in AX25"

    This reverts commit f99bcff.
    
    Like netrom, Alan Cox says that zero lengths have real meaning
    and are useful in this protocol.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 27, 2009
  7. @davem330

    Revert "netrom: zero length frame filtering in NetRom"

    This reverts commit a3ac80a.
    
    Alan Cox says that zero length writes do have special meaning
    and are useful in this protocol.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 27, 2009
  8. @davem330
  9. @linvjw

    cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n

    And update description and feature-removal schedule according
    to the new plan.
    
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Luis R. Rodriguez committed with linvjw Mar 24, 2009
  10. @jmberg @linvjw

    mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

    This patch removes all the virtual A-MPDU-queue bookkeeping from
    mac80211. Curiously, iwlwifi already does its own bookkeeping, so
    it doesn't require much changes except where it needs to handle
    starting and stopping the queues in mac80211.
    
    To handle the queue stop/wake properly, we rewrite the software
    queue number for aggregation frames and internally to iwlwifi keep
    track of the queues that map into the same AC queue, and only talk
    to mac80211 about the AC queue. The implementation requires calling
    two new functions, iwl_stop_queue and iwl_wake_queue instead of the
    mac80211 counterparts.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Cc: Reinette Chattre <reinette.chatre@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  11. @jmberg @linvjw

    mac80211: fix aggregation to not require queue stop

    Instead of stopping the entire AC queue when enabling aggregation
    (which was only done for hardware with aggregation queues) buffer
    the packets for each station, and release them to the pending skb
    queue once aggregation is turned on successfully.
    
    We get a little more code, but it becomes conceptually simpler and
    we can remove the entire virtual queue mechanism from mac80211 in
    a follow-up patch.
    
    This changes how mac80211 behaves towards drivers that support
    aggregation but have no hardware queues -- those drivers will now
    not be handed packets while the aggregation session is being
    established, but only after it has been fully established.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  12. @jmberg @linvjw

    mac80211: add skb length sanity checking

    We just found a bug in zd1211rw where it would reject
    packets in the ->tx() method but leave them modified,
    which would cause retransmit attempts with completely
    bogus skbs, eventually leading to a panic due to not
    having enough headroom in those.
    
    This patch adds a sanity check to mac80211 to catch
    such driver mistakes; in this case we warn and drop
    the skb.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  13. @jmberg @linvjw

    mac80211: unify and fix TX aggregation start

    When TX aggregation becomes operational, we do a number of steps:
     1) print a debug message
     2) wake the virtual queue
     3) notify the driver
    
    Unfortunately, 1) and 3) are only done if the driver is first to
    reply to the aggregation request, it is, however, possible that the
    remote station replies before the driver! Thus, unify the code for
    this and call the new function ieee80211_agg_tx_operational in both
    places where TX aggregation can become operational.
    
    Additionally, rename the driver notification from
    IEEE80211_AMPDU_TX_RESUME to IEEE80211_AMPDU_TX_OPERATIONAL.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  14. @jmberg @linvjw

    mac80211: clean up __ieee80211_tx args

    __ieee80211_tx takes a struct ieee80211_tx_data argument, but only
    uses a few of its members, namely 'skb' and 'sta'. Make that explicit,
    so that less internal knowledge is required in ieee80211_tx_pending
    and the possibility of introducing errors here is removed.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Reviewed-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  15. @jmberg @linvjw

    mac80211: rework the pending packets code

    The pending packets code is quite incomprehensible, uses memory barriers
    nobody really understands, etc. This patch reworks it entirely, using
    the queue spinlock, proper stop bits and the skb queues themselves to
    indicate whether packets are pending or not (rather than a separate
    variable like before).
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Reviewed-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  16. @jmberg @linvjw

    mac80211: fix A-MPDU queue assignment

    Internally, mac80211 requires the skb's queue mapping to be set
    to the AC queue, not the virtual A-MPDU queue. This is not done
    correctly currently, this patch moves the code down to directly
    before the driver is invoked and adds a comment that it will be
    moved into the driver later.
    
    Since this requires __ieee80211_tx() to have the sta pointer,
    make sure to provide it in ieee80211_tx_pending().
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Reviewed-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  17. @jmberg @linvjw

    mac80211: rewrite fragmentation

    Fragmentation currently uses an allocated array to store the
    fragment skbs, and then keeps track of which have been sent
    and which are still pending etc. This is rather complicated;
    make it simpler by just chaining the fragments into skb->next
    and removing from that list when sent. Also simplifies all
    code that needs to touch fragments, since it now only needs
    to walk the skb->next list.
    
    This is a prerequisite for fixing the stored packet code,
    which I need to do for proper aggregation packet storing.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Reviewed-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  18. @linvjw

    iwlwifi: show current driver status in user readable format

    change the display of current driver status bit to user readable format
    for better and easier debugging
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Wey-Yi Guy committed with linvjw Mar 24, 2009
  19. @linvjw

    b43: Add BCM4307 PCI-ID

    00:09.0 Network controller [0280]: Broadcom Corporation BCM4307 Ethernet Controller [14e4:4306] (rev 03)
        Subsystem: Broadcom Corporation BCM4307 Ethernet Controller [14e4:4306]
        Flags: bus master, fast devsel, latency 32, IRQ 10
        Memory at d7000000 (32-bit, non-prefetchable) [size=8K]
        Kernel driver in use: b43-pci-bridge
        Kernel modules: ssb
    
    Reported-by: yoann <yoann71@msn.com>
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Michael Buesch committed with linvjw Mar 24, 2009
  20. @jmberg @linvjw

    cfg80211: fix locking in nl80211_set_wiphy

    Luis reports that there's a circular locking dependency;
    this is because cfg80211_dev_rename() will acquire the
    cfg80211_mutex while the device mutex is held, while
    this normally is done the other way around. The solution
    is to open-code the device-getting in nl80211_set_wiphy
    and require holding the mutex around cfg80211_dev_rename
    rather than acquiring it within.
    
    Also fix a bug -- rtnl locking is expected by drivers so
    we need to provide it.
    
    Reported-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 24, 2009
  21. @jmberg @linvjw

    mac80211: fix RX path

    My previous patch ("mac80211: remove mixed-cell and userspace MLME code")
    was too obvious to me, so obvious that a stupid bug crept in. The IBSS
    RX function must be invoked for IBSS, of course, not anything != IBSS.
    
    Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 24, 2009
  22. @bcopeland @linvjw

    ath5k: properly drop packets from ops->tx

    We shouldn't return NETDEV_TX_BUSY from the TX callback, especially
    after we've mucked with the sk_buffs.  Drop the packets and return
    NETDEV_TX_OK.
    
    Changes-licensed-under: 3-Clause-BSD
    
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    bcopeland committed with linvjw Mar 23, 2009
  23. @linvjw

    ar9170: single module build

    This patch restores all-in-one module build procedure for ar9170.
    
    Signed-off-by: Christian Lamparter <chunkeey@web.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Christian Lamparter committed with linvjw Mar 24, 2009
  24. @linvjw

    ath9k: fix dma mapping leak of rx buffer upon rmmod

    We were claiming DMA buffers on the RX tasklet but never
    upon a simple module removal.
    
    Cc: stable@kernel.org
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Luis R. Rodriguez committed with linvjw Mar 23, 2009
  25. @IvD @linvjw

    rt2x00: New USB ID for rt73usb

    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    IvD committed with linvjw Mar 21, 2009
  26. @bcopeland @linvjw

    ath5k: warn and correct rate for unknown hw rate indexes

    ath5k sets up a mapping table from the hardware rate index to
    the rate index used by mac80211; however, we have seen some
    received frames with incorrect rate indexes.  Such frames
    normally get dropped with a warning in __ieee80211_rx(),
    but it doesn't include enough information to track down the
    error.
    
    This patch adds a warning to hw_to_driver_rix for any lookups
    that result in a rate index of -1, then returns a valid rate so
    the frame can be processed.
    
    Changes-licensed-under: 3-Clause-BSD
    
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Cc: stable@kernel.org
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    bcopeland committed with linvjw Mar 2, 2009
  27. @linvjw

    b43: fix b43_plcp_get_bitrate_idx_ofdm return type

    This patch fixes the return type of b43_plcp_get_bitrate_idx_ofdm. If
    the plcp contains an error, the function return value is 255 instead
    of -1, and the packet was not dropped. This causes a warning in
    __ieee80211_rx function because rate idx is out of range.
    
    Cc: stable@kernel.org
    Signed-off-by: Lorenzo Nava <navalorenx@gmail.com>
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Lorenzo Nava committed with linvjw Mar 22, 2009
  28. @linvjw

    p54: Kconfig maintenance

    This patch updates p54's Kconfig entry and removes the out-dated device list.
    
    Signed-off-by: Christian Lamparter <chunkeey@web.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Christian Lamparter committed with linvjw Mar 23, 2009
  29. @jmberg @linvjw

    mac80211: rate control status only for controlled packets

    This patch changes mac80211 to not notify the rate control algorithm's
    tx_status() method when reporting status for a packet that didn't go
    through the rate control algorithm's get_rate() method.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    jmberg committed with linvjw Mar 23, 2009
  30. @linvjw

    ar9170: simplify & deBUG tx_status queueing and reporting

    This patch simplifies the tx_status report code by using four tx_queues per
    station instead of only one. (the skb lookup should be in O(1) now :-p ).
    
    Also, it fixes a really obvious copy&paste bug in the janitor work code and
    adds back a few spilled bits to the hardware definition header about QoS.
    
    Signed-off-by: Christian Lamparter <chunkeey@web.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Christian Lamparter committed with linvjw Mar 23, 2009
  31. @linvjw

    mac80211: add beacon filtering support

    Add IEEE80211_HW_BEACON_FILTERING flag so that driver inform that it supports
    beacon filtering. Drivers need to call the new function
    ieee80211_beacon_loss() to notify about beacon loss.
    
    Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Kalle Valo committed with linvjw Mar 22, 2009
  32. @linvjw

    cfg80211: add feature to hold bss

    In beacon filtering there needs to be a way to not expire the BSS even
    when no beacons are received. Add an interface to cfg80211 to hold
    BSS and make sure that it's not expired.
    
    Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Kalle Valo committed with linvjw Mar 22, 2009
  33. @linvjw

    mac80211: disable power save when scanning

    When software scanning we need to disable power save so that all possible
    probe responses and beacons are received. For hardware scanning assume that
    hardware will take care of that and document that assumption.
    
    Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Kalle Valo committed with linvjw Mar 22, 2009
  34. @linvjw

    mac80211: track beacons separately from the rx path activity

    Separate beacon and rx path tracking in preparation for the beacon filtering
    support. At the same time change ieee80211_associated() to look a bit simpler.
    
    Probe requests are now sent only after IEEE80211_PROBE_IDLE_TIME, which
    is now set to 60 seconds.
    
    Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Kalle Valo committed with linvjw Mar 22, 2009
  35. @linvjw

    mac80211: decrease execution of the associated timer

    Currently the timer is triggering every two seconds
    (IEEE80211_MONITORING_INTERVAL). Decrease the timer to only trigger during
    data idle periods to avoid waking up CPU unnecessary. The timer will
    still trigger during idle periods, that needs to be fixed later.
    
    There's also a functional change that probe requests are sent only when the
    data path is idle, earlier they were sent also while there was activity
    on the data path.
    
    This is also preparation for the beacon filtering support. Thanks to
    Johannes Berg for the idea.
    
    Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Kalle Valo committed with linvjw Mar 22, 2009
Something went wrong with that request. Please try again.