1. 20 7月, 2011 9 次提交
  2. 19 7月, 2011 5 次提交
  3. 18 7月, 2011 6 次提交
  4. 17 7月, 2011 10 次提交
  5. 15 7月, 2011 10 次提交
    • D
      25009a1a
    • F
      8139cp: convert to new VLAN model. · 6864ddb2
      françois romieu 提交于
      The registers and descriptors bits are identical to the pre-8168
      8169 chipsets : {RxDesc / TxDesc}.opts2 can only contain VLAN information.
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Reviewed-by: NJiri Pirko <jpirko@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6864ddb2
    • K
      Remove redundant variable/code in __qdisc_run · f0c50c7c
      Krishna Kumar 提交于
      Remove redundant variable "work".
      Signed-off-by: NKrishna Kumar <krkumar2@in.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f0c50c7c
    • O
      slcan: remove obsolete code in slcan initialisation · 2af4ba85
      Oliver Hartkopp 提交于
      This patch removes obsolete code in the initialisation/creation of
      slcan devices.
      
      It follows the suggested cleanups from Ilya Matvejchikov in
      drivers/net/slip.c that where recently applied to net-next-2.6:
      
      - slip: remove dead code within the slip initialization
      - slip: remove redundant check slip_devs for NULL
      Signed-off-by: NOliver Hartkopp <socketcan@hartkopp.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2af4ba85
    • S
      Separate handling of irq type flags variable from the irq_flags request_irq variable · 8279171a
      Shyam Iyer 提交于
      Commit 5f77898d does not completely
      fix the problem of handling allocations with irqs disabled..  The
      below patch on top of it fixes the problem completely.
      
      Based on review by "Ivan Vecera" <ivecera@redhat.com>..
      "
      Small note, the root of the problem was that non-atomic allocation was requested with IRQs disabled. Your patch description does not contain wwhy were the IRQs disabled.
      
      The function bnad_mbox_irq_alloc incorrectly uses 'flags' var for two different things, 1) to save current CPU flags and 2) for request_irq
      call.
      First the spin_lock_irqsave disables the IRQs and saves _all_ CPU flags (including one that enables/disables interrupts) to 'flags'. Then the 'flags' is overwritten by 0 or 0x80 (IRQF_SHARED). Finally the spin_unlock_irqrestore should restore saved flags, but these flags are now either 0x00 or 0x80. The interrupt bit value in flags register on x86 arch is 0x100.
      This means that the interrupt bit is zero (IRQs disabled) after spin_unlock_irqrestore so the request_irq function is called with disabled interrupts.
      "
      Signed-off-by: NShyam Iyer <shyam_iyer@dell.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8279171a
    • J
      Merge branch 'master' of... · 95a943c1
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
      
      Conflicts:
      	net/bluetooth/l2cap_core.c
      95a943c1
    • G
      net/ps3: Fix gelic RX DMA restart · ecae42d3
      Geoff Levand 提交于
      Fix the condition where PS3 network RX hangs when no network
      TX is occurring by calling gelic_card_enable_rxdmac() during
      RX_DMA_CHAIN_END event processing.
      
      The gelic hardware automatically clears its RX_DMA_EN flag when
      it detects an RX_DMA_CHAIN_END event.  In its processing of
      RX_DMA_CHAIN_END the gelic driver is required to set RX_DMA_EN
      (with a call to gelic_card_enable_rxdmac()) to restart RX DMA
      transfers.  The existing gelic driver code does not set
      RX_DMA_EN directly in its processing of the RX_DMA_CHAIN_END
      event, but uses a flag variable card->rx_dma_restart_required
      to schedule the setting of RX_DMA_EN until next inside the
      interrupt handler.
      
      It seems this delayed setting of RX_DMA_EN causes the hang since
      the next RX interrupt after the RX_DMA_CHAIN_END event where
      RX_DMA_EN is scheduled to be set will not occur since RX_DMA_EN
      was not set.  In the case were network TX is occuring, RX_DMA_EN
      is set in the next TX interrupt and RX processing continues.
      Signed-off-by: NGeoff Levand <geoff@infradead.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ecae42d3
    • A
      bnx2x: Multiple concurrent l2 traffic classes · 6383c0b3
      Ariel Elior 提交于
      Overview:
       Support mapping of priorities to traffic classes and
       traffic classes to transmission queues ranges in the net device.
       The queue ranges are (count, offset) pairs relating to the txq
       array.
       This can be done via DCBX negotiation or by kernel.
       As a result Enhanced Transmission Selection (ETS) and Priority Flow
       Control (PFC) are supported between L2 network traffic classes.
      
       Mapping:
       This patch uses the netdev_set_num_tc, netdev_set_prio_tc_map and
       netdev_set_tc_queue functions to map priorities to traffic classes
       and traffic classes to transmission queue ranges.
       This mapping is performed by bnx2x_setup_tc function which is
       connected to the ndo_setup_tc.
       This function is always called at nic load where by default it
       maps all priorities to tc 0, and it may also be called by the
       kernel or by the bnx2x upon DCBX negotiation to modify the mapping.
      
       rtnl lock:
       When the ndo_setup_tc is called at nic load or by kernel the rtnl
       lock is already taken. However, when DCBX negotiation takes place
       the lock is not taken. The work is therefore scheduled to be
       handled by the sp_rtnl task.
      
       Fastpath:
       The fastpath structure of the bnx2x which was previously used
       to hold the information of one tx queue and one rx queue was
       redesigned to represent multiple tx queues, one for each traffic
       class.
       The transmission queue supplied in the skb by the kernel can no
       longer be interpreted as a straightforward index into the fastpath
       structure array, but it must rather be decoded to the appropriate
       fastpath index and the tc within that fastpath.
      
       Slowpath:
       The bnx2x's queue object was redesigned to accommodate multiple
       transmission queues. The queue object's state machine was enhanced
       to allow opening multiple transmission-only connections on top of
       the regular tx-rx connection.
      
       Firmware:
       This feature relies on the tx-only queue feature introduced in the
       bnx2x 7.0.23 firmware and the FW likewise must have the bnx2x multi
       cos support.
      Signed-off-by: NAriel Elior <ariele@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6383c0b3
    • A
      bnx2x: Renaming the "reset_task" to "sp_rtnl_task" · 7be08a72
      Ariel Elior 提交于
      Renaming the "reset_task" to a more general purpose name,
       "sp_rtnl_task", as it is already used for another purpose
       other than reset which is parity recovery, and since I
       plan to add a third operation for this task, updating the
       priority to traffic class and traffic class to transmission
       queues mappings after dcbx negotiation takes place.
      Signed-off-by: NAriel Elior <ariele@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7be08a72
    • D