1. 24 8月, 2014 26 次提交
  2. 23 8月, 2014 14 次提交
    • Y
      tcp: improve undo on timeout · 989e04c5
      Yuchung Cheng 提交于
      Upon timeout, undo (via both timestamps/Eifel and DSACKs) was
      disabled if any retransmits were still in flight.  The concern was
      perhaps that spurious retransmission sent in a previous recovery
      episode may trigger DSACKs to falsely undo the current recovery.
      
      However, this inadvertently misses undo opportunities (using either
      TCP timestamps or DSACKs) when timeout occurs during a loss episode,
      i.e.  recurring timeouts or timeout during fast recovery. In these
      cases some retransmissions will be in flight but we should allow
      undo. Furthermore, we should only reset undo_marker and undo_retrans
      upon timeout if we are starting a new recovery episode. Finally,
      when we do reset our undo state, we now do so in a manner similar
      to tcp_enter_recovery(), so that we require a DSACK for each of
      the outstsanding retransmissions. This will achieve the original
      goal by requiring that we receive the same number of DSACKs as
      retransmissions.
      
      This patch increases the undo events by 50% on Google servers.
      Signed-off-by: NYuchung Cheng <ycheng@google.com>
      Signed-off-by: NNeal Cardwell <ncardwell@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      989e04c5
    • S
      phylib: use MDIO_DEVS[12] · a7d5f58d
      Sergei Shtylyov 提交于
      The bare register numbers are used despite <uapi/linux/mdio.h> has MDIO_DEVS[12]
      #define'd for those.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a7d5f58d
    • E
      net: remove dead code after sk_data_ready change · 884cf705
      Eric Dumazet 提交于
      As a followup to commit 676d2369 ("net: Fix use after free by
      removing length arg from sk_data_ready callbacks"), we can remove
      some useless code in sock_queue_rcv_skb() and rxrpc_queue_rcv_skb()
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      884cf705
    • E
      net: use ktime_get_ns() and ktime_get_real_ns() helpers · d2de875c
      Eric Dumazet 提交于
      ktime_get_ns() replaces ktime_to_ns(ktime_get())
      
      ktime_get_real_ns() replaces ktime_to_ns(ktime_get_real())
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d2de875c
    • G
      vxlan: fix incorrect initializer in union vxlan_addr · a45e92a5
      Gerhard Stenzel 提交于
      The first initializer in the following
      
              union vxlan_addr ipa = {
                  .sin.sin_addr.s_addr = tip,
                  .sa.sa_family = AF_INET,
              };
      
      is optimised away by the compiler, due to the second initializer,
      therefore initialising .sin.sin_addr.s_addr always to 0.
      This results in netlink messages indicating a L3 miss never contain the
      missed IP address. This was observed with GCC 4.8 and 4.9. I do not know about previous versions.
      The problem affects user space programs relying on an IP address being
      sent as part of a netlink message indicating a L3 miss.
      
      Changing
                  .sa.sa_family = AF_INET,
      to
                  .sin.sin_family = AF_INET,
      fixes the problem.
      Signed-off-by: NGerhard Stenzel <gerhard.stenzel@de.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a45e92a5
    • D
      Merge tag 'linux-can-next-for-3.18-20140820' of git://gitorious.org/linux-can/linux-can-next · 3f8a2b74
      David S. Miller 提交于
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2014-08-20
      
      this is a pull request of 10 patches for net-next/master.
      
      There is one patch by Wolfram Sang to clean up the build system.
      Two patches by Stefan Agner that add vf610 support to the flexcan
      driver. Dong Aisheng add support for bosch's m_can core, which is found
      in the new freescale ARM SoCs. Sergei Shtylyov improves the rcar_can
      driver by supporting all input clocks and adding device tree support.
      The next patch is a small cleanup for the bit rate calculation function
      by Lad, Prabhakar. And finally a patch by Himangi Saraogi, which
      converts the mcp251x driver to use dmam_alloc_coherent.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3f8a2b74
    • L
      Merge tag 'pwm/for-3.17-rc2' of... · 451fd722
      Linus Torvalds 提交于
      Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm fix from Thierry Reding:
       "Just one bugfix for the PWM lookup table code that would cause a PWM
        channel to be set to the wrong period and polarity for non-perfect
        matches"
      
      * tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: Fix period and polarity in pwm_get() for non-perfect matches
      451fd722
    • M
      mac80211: fix channel switch for chanctx-based drivers · 47e4df94
      Michal Kazior 提交于
      The new_ctx pointer is set only for non-chanctx drivers.  This yielded a
      crash for chanctx-based drivers during channel switch finalization:
      
        BUG: unable to handle kernel NULL pointer dereference at 0000000000000020
        IP: ieee80211_vif_use_reserved_switch+0x71c/0xb00 [mac80211]
      
      Use an adequate chanctx pointer to fix this.
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NMichal Kazior <michal.kazior@tieto.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      47e4df94
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 433ab34d
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "Here are some bug fixes that have piled up during ksummit/linuxcon.
      
         1) Fix endian problems in ibmveth, from Anton Blanchard.
      
         2) IPV6 routing code does GFP_KERNEL allocation in atomic, fix from
            Benjamin Block.
      
         3) SCTP association fixes from Daniel Borkmann.
      
         4) When multiple VLAN headers are present we have to make sure the
            second and subsequent ones are pullable in the SKB otherwise we
            blindly dereference garbage.  From Jiri Benc.
      
         5) The argument adjustment of the signature of hlist_add_after*()
            introduced a regression in the batman-adv code, fix from Sven
            Eckelmann.
      
         6) Fix TX hang handling to avoid a panic in i40e, from Anjali Singhai
            Jain.
      
         7) PTP flag test is inverted in i40e driver, from Jesse Brandeburg.
      
         8) ATM LEC driver needs to hold RTNL mutex over MTU changes, from
            Chas Williams.
      
         9) Truncate packets larger then the TPACKET_V3 format configured
            buffers, otherwise we overwrite past the end of said buffers.
            From Eric Dumazet.
      
        10) Fix endianness bugs in qlcnic firmware handling, from Rajesh
            Borundia and Shahed Shaikh.
      
        11) CXGB4 sometimes doesn't get all of the TX completion events it
            should resulting in SKBs getting stuck in the TX queue, from
            Hariprasad Shenai.
      
        12) When the FEC chip's PTP clock is disabled, you can't access the
            register.  Add necessary checks to avoid the resulting hang, from
            Fugang Duan"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
        drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
        net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
        net: sctp: spare unnecessary comparison in sctp_trans_elect_best
        net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
        ibmveth: Fix endian issues with rx_no_buffer statistic
        net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
        openvswitch: fix panic with multiple vlan headers
        net: ipv6: fib: don't sleep inside atomic lock
        net: fec: ptp: avoid register access when ipg clock is disabled
        cxgb4: Free completed tx skbs promptly
        cxgb4: Fix race condition in cleanup
        sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
        bnx2x: Revert UNDI flushing mechanism
        qlcnic: Fix endianess issue in firmware load from file operation
        qlcnic: Fix endianess issue in FW dump template header
        qlcnic: Fix flash access interface to application
        MAINTAINERS: Add section for MRF24J40 IEEE 802.15.4 radio driver
        macvlan: Allow setting multicast filter on all macvlan types
        packet: handle too big packets for PACKET_V3
        MAINTAINERS: add entry for ec_bhf driver
        ...
      433ab34d
    • C
      dp83640: Fix length check for event timestamp status messages · 13322f2e
      Christian Riesch 提交于
      Event timestamp status messages have a variable length, ranging from
      1 to 5 words (16 bit words). The current code however requires
      a minimum message length of sizeof(*phy_txts). In most cases this
      condition is fulfilled due to padding bytes. However, if several events
      are signaled in a single message, padding bytes may not be present.
      For short event timestamp status messages, the length check will fail,
      and the event timestamp will be dropped.
      Signed-off-by: NChristian Riesch <christian.riesch@omicron.at>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      13322f2e
    • L
      net: stmmac: add fix_mac_speed support for socfpga · b4834c86
      Ley Foon Tan 提交于
      This patch adds fix_mac_speed() support for
      Altera socfpga Ethernet controller. Emac splitter is a
      soft IP core in FPGA system that converts GMII interface from
      Synopsys mac to RGMII/SGMII interface. This splitter core is
      an optional IP if user would like to use RGMII/SGMII
      interface in their system. Software needs to update a register
      in splitter core when there is speed change.
      Signed-off-by: NLey Foon Tan <lftan@altera.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4834c86
    • C
      r8169:add support for RTL8168H and RTL8107E · 6e1d0b89
      Chun-Hao Lin 提交于
      RTL8168H is Realtek PCIe Gigabit Ethernet controller.
      RTL8107E is Realtek PCIe Fast Ethernet controller.
      
      This patch add support for these two chips.
      Signed-off-by: NChun-Hao Lin <hau@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6e1d0b89
    • J
      bonding: create netlink event when bonding option is changed · d4261e56
      Jiri Pirko 提交于
      Userspace needs to be notified if one changes some option.
      Signed-off-by: NJiri Pirko <jiri@resnulli.us>
      Acked-by: NVeaceslav Falico <vfalico@gmail.com>
      Acked-by: NAndy Gospodarek <gospo@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d4261e56
    • D
      Merge branch 'bnx2x-next' · 0c32ec8f
      David S. Miller 提交于
      Yuval Mintz says:
      
      ====================
      bnx2x: Start utilizing 7.10.51
      
      This series will enable bnx2x to start utlizing its 7.10.51 FW.
      In addition, it will also add timestamping support, as well as a couple
      of routine semantic cleanups.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0c32ec8f