Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.21-rc2
Commits on Feb 28, 2007
  1. Linux 2.6.21-rc2

    Linus Torvalds authored
    Too many changes for comfort since -rc1.  Some missed merges, and some
    just annoyingly big fixes since.  This is not how an -rc2 should look.
    Need to really calm things down!
Commits on Feb 27, 2007
  1. [SPARC64]: Fix PCI interrupts on E450 et al.

    David S. Miller authored
    When the PCI controller OBP node lacks an interrupt-map
    and interrupt-map-mask property, we need to form the
    INO by hand.  The PCI swizzle logic was not doing that
    properly.
    
    This was a regression added by the of_device code.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
      [AGPGART] fix compile errors
  3. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (52 commits)
      netxen: do_rom_fast_write error handling
      natsemi: Fix detection of vanilla natsemi cards
      net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff
      chelsio: Fix non-NAPI compile
      cxgb3 - Feed Rx free list with pages
      cxgb3 - Recovery from HW starvation of response queue entries.
      cxgb3 - Unmap offload packets when they are freed
      cxgb3 - FW version update
      cxgb3 - private ioctl cleanup
      cxgb3 - manage sysfs attributes per port
      S2IO: Restoring the mac address in s2io_reset
      S2IO: Avoid printing the Enhanced statistics for Xframe I card.
      S2IO: Making LED off during LINK_DOWN notification.
      S2IO: Added a loadable parameter to enable or disable vlan stripping in frame.
      S2IO: Optimized the delay to wait for command completion
      S2IO: Fixes for MSI and MSIX
      qla3xxx: Bumping driver version number
      qla3xxx: Kernic Panic on pSeries under stress conditions
      qla3xxx: bugfix tx reset after stress conditions.
      qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send()
      ...
  4. Merge branch 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/…

    Linus Torvalds authored
    …git/jgarzik/misc-2.6
    
    * 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
      remove the jffs MAINTAINERS entry
  5. netxen: do_rom_fast_write error handling

    Stephen Hemminger authored Jeff Garzik committed
    Compiler warning spots real error!
    
    The function do_rom_fast_read called in do_rom_fast_write can fail
    and leave data1 unset. This causes a compile warning.
    The correct thing is to propagate the error out.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  6. @AdrianBunk

    remove the jffs MAINTAINERS entry

    AdrianBunk authored Jeff Garzik committed
    This patch removes the MAINTAINERS entry for the removed jffs
    filesystem.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  7. @broonie

    natsemi: Fix detection of vanilla natsemi cards

    broonie authored Jeff Garzik committed
    Bob Tracy <rct@gherkin.frus.com> reported that the addition of support
    for Aculab E1/T1 cPCI carrier cards broke detection of vanilla natsemi
    cards.  This patch fixes that: the problem is that the driver-specific
    ta in the PCI device table is an index into a second table and this
    had not been updated for the vanilla cards.
    
    This patch fixes the problem minimally.
    
    Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  8. @Alan-Cox

    net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff

    Alan-Cox authored Jeff Garzik committed
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  9. chelsio: Fix non-NAPI compile

    Roland Dreier authored Jeff Garzik committed
    Chelsio without NAPI enabled has been broken (won't compile) since
    3de00b8 ("chelsio: NAPI speed improvement"):
    
        drivers/net/chelsio/sge.c: In function `t1_interrupt`:
        drivers/net/chelsio/sge.c:1716: error: `Q` undeclared (first use in this function)
    
    The change below seems to add back in the declaration and
    initialization of `Q` that was removed by mistake, and at least makes
    the driver compile for me, although I have no hardware and hence no
    way to test whether this actually works.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  10. cxgb3 - Feed Rx free list with pages

    Divy Le Ray authored Jeff Garzik committed
    Populate Rx free list with pages.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  11. cxgb3 - Recovery from HW starvation of response queue entries.

    Divy Le Ray authored Jeff Garzik committed
    Improve the traffic recovery after the HW ran out of response queue entries.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  12. cxgb3 - Unmap offload packets when they are freed

    Divy Le Ray authored Jeff Garzik committed
    Offload packets may be DMAed long after their SGE Tx descriptors are done
    so they must remain mapped until they are freed rather than until their
    descriptors are freed.  Unmap such packets through an skb destructor.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  13. cxgb3 - FW version update

    Divy Le Ray authored Jeff Garzik committed
    Update FW version to 3.2
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  14. cxgb3 - private ioctl cleanup

    Divy Le Ray authored Jeff Garzik committed
    Clean up some private ioctls.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  15. cxgb3 - manage sysfs attributes per port

    Divy Le Ray authored Jeff Garzik committed
    sysfs attributes are now managed per port, no longer per adapter.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  16. S2IO: Restoring the mac address in s2io_reset

    Sivakumar Subramani authored Jeff Garzik committed
    - Restore in s2io_reset, the mac address assigned during s2io_open.
      Earlier, it was getting overwritten to the factory default (read from the
      eeprom) and subsequently dropping received frames.
    
    - Fixed the typo in calling rtnl_unlock in s2io_set_link function.
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  17. S2IO: Avoid printing the Enhanced statistics for Xframe I card.

    Sivakumar Subramani authored Jeff Garzik committed
    - Enhanced Statistics are supported only for Xframe II (Herculas) card. Add
      condition check such Enhanced statistics will included only in the case of
      Xframe II card.
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  18. S2IO: Making LED off during LINK_DOWN notification.

    Sivakumar Subramani authored Jeff Garzik committed
    - Turning off LED for LINK_DOWN notification
    - Return from rxd_owner_bit_reset function if call to set_rxd_buffer_pointer
      fails with ENOMEM
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  19. S2IO: Added a loadable parameter to enable or disable vlan stripping …

    Sivakumar Subramani authored Jeff Garzik committed
    …in frame.
    
    - Added code to not to strip vlan tag when driver is in promiscuous mode
    - Added module loadable parameter 'vlan_tag_strip" through which user can
      enable or disable vlan stripping irrespective of mode
      ( promiscuous or non-promiscuous ).
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  20. S2IO: Optimized the delay to wait for command completion

    Sivakumar Subramani authored Jeff Garzik committed
    - Optimized delay to wait for command completion so as to reduce the
      initialization wait time.
    - Disable differentiated services steering. By default RMAC is configured to
      steer traffic with certain DS codes to other queues. Driver must initialize
      the DS memory to 0 to make sure that DS steering will not be used by default.
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  21. S2IO: Fixes for MSI and MSIX

    Sivakumar Subramani authored Jeff Garzik committed
    - Added debug statements to print a debug message if the MSI/MSI-X vector (or)
      data is zero.
    
    - This patch removes the code that will enable NAPI for the case of single
      ring and MSI-X / MSI case. There are some issue in the enabling NAPI with
      MSI/MSI-X.  So we are turning off NAPI in the case of MSI/MSI-X.
    
    Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  22. qla3xxx: Bumping driver version number

    Benjamin Li authored Jeff Garzik committed
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  23. qla3xxx: Kernic Panic on pSeries under stress conditions

    Benjamin Li authored Jeff Garzik committed
    To reproduce this panic consistently, we run an intensive network
    application like 'netperf'. After waiting for a couple of seconds,
    you will see a stack trace and a kernel panic where we are calling
    pci_unmap_single() in ql_poll().
    
    Changes:
    1)  Check the flags on the Response MAC IO Control block to check for
    errors
    2)  Ensure that if we are on the 4022 we only use one segment
    3)  Before, we were reading the memory mapped producer index register
    everytime we iterated in the loop when clearing the queue.  We should
    only be iterating to a known point, not as the producer index
    is being updated.
    
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  24. qla3xxx: bugfix tx reset after stress conditions.

    Ron Mercer authored Jeff Garzik committed
    To Reproduce the Problem:
    To reproduce this panic consistently, we run an intensive network
    application like 'netperf' and then switch to a different console.
    After waiting for a couple of seconds, you will see a tx reset has occured.
    
    Reason:
    We enable interrupts even if we were not running.
    
    Solution:
    Now we will enable interrupts only after we are ready to give up the poll
    routine.
    
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  25. qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg…

    Benjamin Li authored Jeff Garzik committed
    …_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send()
    
    pci_map_single() could fail.  We need to properly check the return
    code from pci_map_single().  If we can not properly map this address,
    then we should cleanup and return the proper return code.
    
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  26. qla3xxx: bugfix: Fixed jumbo frame handling for 3032 chip.

    Ron Mercer authored Jeff Garzik committed
    The scatter/gather lists were not being build correctly.  When
    large frames spanned several buffers the chip would panic.
    
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  27. qla3xxx: Clean up receive process.

    Ron Mercer authored Jeff Garzik committed
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  28. qla3xxx: Dynamically size the rx buffer queue based on the MTU.

    Ron Mercer authored Jeff Garzik committed
    This change removes use of constants for rx buffer queue size
    and instead calculates the queue length based on what he MTU
    is set to.
    
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  29. qla3xxx: Remove API to change MTU.

    Ron Mercer authored Jeff Garzik committed
    This network device driver shares the same hardware as the qla4xxx
    iSCSI driver. Changing the MTU via the device interface will
    cause qla4xxx to crash as there is no way to make notification.
    Users wishing to change the MTU must do so using an iSCSI
    utility such as Qlogic SanSurfer. This forces the user to
    unload/reload this network device driver after the MTU
    value has been changed in flash.
    
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  30. qla3xxx: Fix deadlock issue on error paths

    Benjamin Li authored Jeff Garzik committed
    1) Fix deadlock issue when in QL_RESET_ACTIVE state and traversing
       through the Link State Machine
    2) Fix deadlock issue when ethtool would call ql_get_settings()
    3) Fix deadlock issue when adaptor is ifup'ed but adaptor fails to initialize
    
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  31. qla3xxx: Changed to use netdev_alloc_skb() from dev_alloc_skb

    Benjamin Li authored Jeff Garzik committed
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  32. qla3xxx: Remove unnecessary memset() in qla3xxx_send()

    Benjamin Li authored Jeff Garzik committed
    We do not need to zero out the 64 byte MAC request I/O control block.
      By zeroing out the control block and setting it to proper fields is
    redundant work.  This is because in the qla3xxx_send() function we will
    already set the proper fields in this structure.  The unused fields are
    not looked at by the hardware and do not need to be zeroed out.
    
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  33. qla3xxx: Return proper error codes when the 4022/4032 is being probed

    Benjamin Li authored Jeff Garzik committed
    The return code was not properly set when when allocating memory or mapping
    memory failed.  Depending on the stack, the return code would sometimes
    return 0, which indicates everything was ok, when in fact there was an error.
      This would cause trouble when the module was removed.  Now, we will pass
    back the proper return code when an error occurs during the PCI probe.
    
    Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  34. @ralfbaechle

    Alignment in mv643xx_eth

    ralfbaechle authored Jeff Garzik committed
    The driver contains this little piece of candy:
    
    #if defined(CONFIG_DMA_NONCOHERENT) || defined(CONFIG_NOT_COHERENT_CACHE)
    #define ETH_DMA_ALIGN           L1_CACHE_BYTES
    #else
    #define ETH_DMA_ALIGN           8
    #endif
    
    Any reason why we're not using dma_get_cache_alignment() instead?
    
      Ralf
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
Something went wrong with that request. Please try again.