1. 23 1月, 2012 5 次提交
  2. 21 1月, 2012 3 次提交
    • N
      tcp: fix undo after RTO for CUBIC · 5a45f008
      Neal Cardwell 提交于
      This patch fixes CUBIC so that cwnd reductions made during RTOs can be
      undone (just as they already can be undone when using the default/Reno
      behavior).
      
      When undoing cwnd reductions, BIC-derived congestion control modules
      were restoring the cwnd from last_max_cwnd. There were two problems
      with using last_max_cwnd to restore a cwnd during undo:
      
      (a) last_max_cwnd was set to 0 on state transitions into TCP_CA_Loss
      (by calling the module's reset() functions), so cwnd reductions from
      RTOs could not be undone.
      
      (b) when fast_covergence is enabled (which it is by default)
      last_max_cwnd does not actually hold the value of snd_cwnd before the
      loss; instead, it holds a scaled-down version of snd_cwnd.
      
      This patch makes the following changes:
      
      (1) upon undo, revert snd_cwnd to ca->loss_cwnd, which is already, as
      the existing comment notes, the "congestion window at last loss"
      
      (2) stop forgetting ca->loss_cwnd on TCP_CA_Loss events
      
      (3) use ca->last_max_cwnd to check if we're in slow start
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Acked-by: NStephen Hemminger <shemminger@vyatta.com>
      Acked-by: NSangtae Ha <sangtae.ha@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5a45f008
    • N
      tcp: fix undo after RTO for BIC · fc16dcd8
      Neal Cardwell 提交于
      This patch fixes BIC so that cwnd reductions made during RTOs can be
      undone (just as they already can be undone when using the default/Reno
      behavior).
      
      When undoing cwnd reductions, BIC-derived congestion control modules
      were restoring the cwnd from last_max_cwnd. There were two problems
      with using last_max_cwnd to restore a cwnd during undo:
      
      (a) last_max_cwnd was set to 0 on state transitions into TCP_CA_Loss
      (by calling the module's reset() functions), so cwnd reductions from
      RTOs could not be undone.
      
      (b) when fast_covergence is enabled (which it is by default)
      last_max_cwnd does not actually hold the value of snd_cwnd before the
      loss; instead, it holds a scaled-down version of snd_cwnd.
      
      This patch makes the following changes:
      
      (1) upon undo, revert snd_cwnd to ca->loss_cwnd, which is already, as
      the existing comment notes, the "congestion window at last loss"
      
      (2) stop forgetting ca->loss_cwnd on TCP_CA_Loss events
      
      (3) use ca->last_max_cwnd to check if we're in slow start
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fc16dcd8
    • R
      enic: fix compile when CONFIG_PCI_IOV is not enabled · b67f231d
      Roopa Prabhu 提交于
      reverting back change that access enic->num_vfs outside
      CONFIG_PCI_IOV
      Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NRoopa Prabhu <roprabhu@cisco.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b67f231d
  3. 20 1月, 2012 9 次提交
  4. 19 1月, 2012 16 次提交
  5. 18 1月, 2012 7 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ccb19d26
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
        tg3: Fix single-vector MSI-X code
        openvswitch: Fix multipart datapath dumps.
        ipv6: fix per device IP snmp counters
        inetpeer: initialize ->redirect_genid in inet_getpeer()
        net: fix NULL-deref in WARN() in skb_gso_segment()
        net: WARN if skb_checksum_help() is called on skb requiring segmentation
        caif: Remove bad WARN_ON in caif_dev
        caif: Fix typo in Vendor/Product-ID for CAIF modems
        bnx2x: Disable AN KR work-around for BCM57810
        bnx2x: Remove AutoGrEEEn for BCM84833
        bnx2x: Remove 100Mb force speed for BCM84833
        bnx2x: Fix PFC setting on BCM57840
        bnx2x: Fix Super-Isolate mode for BCM84833
        net: fix some sparse errors
        net: kill duplicate included header
        net: sh-eth: Fix build error by the value which is not defined
        net: Use device model to get driver name in skb_gso_segment()
        bridge: BH already disabled in br_fdb_cleanup()
        net: move sock_update_memcg outside of CONFIG_INET
        mwl8k: Fixing Sparse ENDIAN CHECK warning
        ...
      ccb19d26
    • M
      tg3: Fix single-vector MSI-X code · c3b5003b
      Matt Carlson 提交于
      Kdump kernels leave MSI-X interrupts (as setup by the crashed kernel)
      enabled.  However, kdump only enables one CPU in the new environment,
      thus causing tg3 to abort MSI-X setup.  When the driver attempts to
      enable INTA or MSI interrupt modes on a kdump kernel, interrupt
      delivery fails.
      
      This patch attempts to workaround the problem by forcing the driver
      to enable a single MSI-X interrupt.  In such a configuration, the
      device's multivector interrupt mode must be disabled.
      Signed-off-by: NMatt Carlson <mcarlson@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c3b5003b
    • B
      openvswitch: Fix multipart datapath dumps. · 77676fdb
      Ben Pfaff 提交于
      The logic to split up the list of datapaths into multiple Netlink messages
      was simply wrong, causing the list to be terminated after the first part.
      Only about the first 50 datapaths would be dumped.  This fixes the
      problem.
      Reported-by: NPaul Ingram <paul@nicira.com>
      Signed-off-by: NBen Pfaff <blp@nicira.com>
      Signed-off-by: NJesse Gross <jesse@nicira.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      77676fdb
    • E
      ipv6: fix per device IP snmp counters · 766e9f1b
      Eric Dumazet 提交于
      In commit 4ce3c183 (snmp: 64bit ipstats_mib for all arches), I forgot
      to change the /proc/net/dev_snmp6/xxx output for IP counters.
      
      percpu array is 64bit per counter but the folding still used the 'long'
      variant, and output garbage on 32bit arches.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      766e9f1b
    • L
      Merge tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6a488979
      Linus Torvalds 提交于
      ARM: fixes for ARM platforms
      
      Some fallout from the 3.3. merge window as well as a couple bug fixes
      for older preexisting bugs that seem valid to include at this time:
      
      * sched_clock changes broke picoxcell, fix included
      * BSYM bugs causing issues with thumb2-built kernels on SMP
      * Missing module.h include on msm.
      * A collection of bugfixes for samsung platforms that didn't make it into
        the first pull requests.
      
      * tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: make BSYM macro assembly only
        ARM: highbank: remove incorrect BSYM usage
        ARM: imx: remove incorrect BSYM usage
        ARM: exynos: remove incorrect BSYM usage
        ARM: ux500: add missing ENDPROC to headsmp.S
        ARM: msm: Add missing ENDPROC to headsmp.S
        ARM: versatile: Add missing ENDPROC to headsmp.S
        ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
        ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
        ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
        ARM: S3C64XX: Remove hsmmc1 from Cragganmore
        ARM: S3C64XX: Remove unconditional power domain disables
        ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
        ARM: SAMSUNG: dma-ops.h needs mach/dma.h
        ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
        ARM: picoxcell: fix sched_clock() cleanup fallout
        ARM: msm: vreg is a module and so needs module.h
      6a488979
    • L
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 57f2685c
      Linus Torvalds 提交于
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
        ARM: mach-shmobile: specify CHCLR registers on SH7372
        dma: shdma: fix runtime PM: clear channel buffers on reset
        dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
        dmaengine/ste_dma40: clear LNK on channel startup
        dmaengine: intel_mid_dma: remove legacy pm interface
        ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
        dmaengine: intel_mid_dma: error path fix
        dmaengine: intel_mid_dma: locking and freeing fixes
        mtd: gpmi-nand: move to dma_transfer_direction
        mtd: fix compile error for gpmi-nand
        mmc: mxs-mmc: fix the dma_transfer_direction migration
        dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
        dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
        dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
        dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
        dma: mxs-dma: fix a typo in comment
        DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
        video i.MX IPU: Fix display connections
        i.MX IPU DMA: Fix wrong burstsize settings
        dmaengine/ste_dma40: allow fixed physical channel
        ...
      
      Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}
      
      The conflicts looked pretty trivial, but I'll ask people to verify them.
      57f2685c
    • L
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · 488a9d01
      Linus Torvalds 提交于
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev:
        [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.
        [libata] add DVRTD08A and DVR-215 to NOSETXFER device quirk list
        [libata] pata_bf54x: Support sg list in bmdma transfer.
        [libata] sata_fsl: fix the controller operating mode
        [libata] enable ata port async suspend
      488a9d01