1. 02 6月, 2017 36 次提交
  2. 01 6月, 2017 4 次提交
    • G
      ppp: remove unnecessary bh disable in xmit path · 97fcc193
      Gao Feng 提交于
      Since the commit 55454a56 ("ppp: avoid dealock on recursive xmit"),
      the PPP xmit path is protected by wrapper functions which disable the
      bh already. So it is unnecessary to disable the bh again in the real
      xmit path.
      Signed-off-by: NGao Feng <gfree.wind@vip.163.com>
      Acked-by: NGuillaume Nault <g.nault@alphalink.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      97fcc193
    • R
      ipv4: route: restore skb_dst_set in inet_rtm_getroute · ba52d61e
      Roopa Prabhu 提交于
      recent updates to inet_rtm_getroute dropped skb_dst_set in
      inet_rtm_getroute. This patch restores it because it is
      needed to release the dst correctly.
      
      Fixes: 3765d35e ("net: ipv4: Convert inet_rtm_getroute to rcu versions of route lookup")
      Reported-by: NJohn Fastabend <john.fastabend@gmail.com>
      Signed-off-by: NDavid Ahern <dsahern@gmail.com>
      Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ba52d61e
    • D
    • D
      Merge branch 'dsa-add-Microchip-KSZ9477-DSA-driver' · 551f40c4
      David S. Miller 提交于
      Woojung Huh says:
      
      ====================
      dsa: add Microchip KSZ9477 DSA driver
      
      This series of patches is for Microchip KSZ9477 DSA driver.
      KSZ9477 is 7 ports GigE switch with numerous advanced features.
      5 ports are 10/100/1000 Mbps internal PHYs and 2 ports have
      Interfaces to SGMII, RGMII, MII or RMII.
      
      This patch supports VLAN, MDB, FDB and port mirroring offloads.
      
      Welcome reviews and comments from community.
      
      Note: Tests are performed on internal development board.
      
      V5
      - add missing MODULE_LICENSE
      
      V4
      - update per review comments
      - cosmetic changes
      - net/dsa/tag_ksz.c
        * skb_put() & memset() are changed to skb_put_padto()
      - drivers/net/dsa/microchip/ksz_common.
         * vlan access mutex is updated
         * mib_names[] is changed to static const
      
      V3
      - update per review comments
      - cosmetic changes
      - drivers/net/dsa/microchip/ksz_common.c
        * clean up ksz_switch_chips[]
        * consolidate checking loops into functions
        * update mutex for better locking
        * replace devm_kmalloc_array() to devm_kcalloc()
      - MAINTAINERS
        * add missing net/dsa/tag_ksz.c
      
      V2
      - update per review comments
      - several cosmetic changes
      - net/dsa/tag_ksz.c
        * constants are changed to defines
        * remove skb_linearize() in ksz_rcv()
        * ksz_xmit()checks skb tailroom before allocate new skb
      - drivers/net/phy/micrel.c
        * remove PHY_HAS_MAGICANEG from ksphy_driver[]
      - drivers/net/dsa/microchip/ksz_common.c
        * add timeout to avoid endless loop
        * port initialization is move to ksz_port_enable() instead of  ksz_setup_ports()
      - Documentation/devicetree/bindings/net/dsa/ksz.txt
        * fix typo and indentations
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      551f40c4