1. 31 1月, 2017 6 次提交
  2. 30 1月, 2017 30 次提交
  3. 28 1月, 2017 4 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4e8f2fc1
      David S. Miller 提交于
      Two trivial overlapping changes conflicts in MPLS and mlx5.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4e8f2fc1
    • S
      batman-adv: Fix includes for IS_ERR/ERR_PTR · 3e7514af
      Sven Eckelmann 提交于
      IS_ERR/ERR_PTR are not defined in linux/device.h but in linux/err.h. The
      files using these macros therefore have to include the correct one.
      Reported-by: NLinus Luessing <linus.luessing@web.de>
      Signed-off-by: NSven Eckelmann <sven@narfation.org>
      Signed-off-by: NSimon Wunderlich <sw@simonwunderlich.de>
      3e7514af
    • S
      batman-adv: Fix double call of dev_queue_xmit · 7c946062
      Sven Eckelmann 提交于
      The net_xmit_eval has side effects because it is not making sure that e
      isn't evaluated twice.
      
          #define net_xmit_eval(e)        ((e) == NET_XMIT_CN ? 0 : (e))
      
      The code requested by David Miller [1]
      
          return net_xmit_eval(dev_queue_xmit(skb));
      
      will get transformed into
      
          return ((dev_queue_xmit(skb)) == NET_XMIT_CN ? 0 : (dev_queue_xmit(skb)))
      
      dev_queue_xmit will therefore be tried again (with an already consumed skb)
      whenever the return code is not NET_XMIT_CN.
      
      [1] https://lkml.kernel.org/r/20170125.225624.965229145391320056.davem@davemloft.net
      
      Fixes: c3370518 ("batman-adv: Treat NET_XMIT_CN as transmit successfully")
      Signed-off-by: NSven Eckelmann <sven@narfation.org>
      Signed-off-by: NSimon Wunderlich <sw@simonwunderlich.de>
      7c946062
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 1b1bc42c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) GTP fixes from Andreas Schultz (missing genl module alias, clear IP
          DF on transmit).
      
       2) Netfilter needs to reflect the fwmark when sending resets, from Pau
          Espin Pedrol.
      
       3) nftable dump OOPS fix from Liping Zhang.
      
       4) Fix erroneous setting of VIRTIO_NET_HDR_F_DATA_VALID on transmit,
          from Rolf Neugebauer.
      
       5) Fix build error of ipt_CLUSTERIP when procfs is disabled, from Arnd
          Bergmann.
      
       6) Fix regression in handling of NETIF_F_SG in harmonize_features(),
          from Eric Dumazet.
      
       7) Fix RTNL deadlock wrt. lwtunnel module loading, from David Ahern.
      
       8) tcp_fastopen_create_child() needs to setup tp->max_window, from
          Alexey Kodanev.
      
       9) Missing kmemdup() failure check in ipv6 segment routing code, from
          Eric Dumazet.
      
      10) Don't execute unix_bind() under the bindlock, otherwise we deadlock
          with splice. From WANG Cong.
      
      11) ip6_tnl_parse_tlv_enc_lim() potentially reallocates the skb buffer,
          therefore callers must reload cached header pointers into that skb.
          Fix from Eric Dumazet.
      
      12) Fix various bugs in legacy IRQ fallback handling in alx driver, from
          Tobias Regnery.
      
      13) Do not allow lwtunnel drivers to be unloaded while they are
          referenced by active instances, from Robert Shearman.
      
      14) Fix truncated PHY LED trigger names, from Geert Uytterhoeven.
      
      15) Fix a few regressions from virtio_net XDP support, from John
          Fastabend and Jakub Kicinski.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (102 commits)
        ISDN: eicon: silence misleading array-bounds warning
        net: phy: micrel: add support for KSZ8795
        gtp: fix cross netns recv on gtp socket
        gtp: clear DF bit on GTP packet tx
        gtp: add genl family modules alias
        tcp: don't annotate mark on control socket from tcp_v6_send_response()
        ravb: unmap descriptors when freeing rings
        virtio_net: reject XDP programs using header adjustment
        virtio_net: use dev_kfree_skb for small buffer XDP receive
        r8152: check rx after napi is enabled
        r8152: re-schedule napi for tx
        r8152: avoid start_xmit to schedule napi when napi is disabled
        r8152: avoid start_xmit to call napi_schedule during autosuspend
        net: dsa: Bring back device detaching in dsa_slave_suspend()
        net: phy: leds: Fix truncated LED trigger names
        net: phy: leds: Break dependency of phy.h on phy_led_triggers.h
        net: phy: leds: Clear phy_num_led_triggers on failure to avoid crash
        net-next: ethernet: mediatek: change the compatible string
        Documentation: devicetree: change the mediatek ethernet compatible string
        bnxt_en: Fix RTNL lock usage on bnxt_get_port_module_status().
        ...
      1b1bc42c