1. 12 Jan, 2017 28 commits
  2. 11 Jan, 2017 12 commits
    • Robert Richter's avatar
      net: thunderx: Make hfunc variable const type in nicvf_set_rxfh() · 171d87ac
      Robert Richter authored
      >From struct ethtool_ops:
      
              int     (*set_rxfh)(struct net_device *, const u32 *indir,
                                  const u8 *key, const u8 hfunc);
      
      Change function arg of hfunc to const type.
      
      V2: Fixed indentation.
      Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      171d87ac
    • Wei Yongjun's avatar
      net: thunderx: Fix error return code in nicvf_open() · 60dce04b
      Wei Yongjun authored
      Fix to return a negative error code from the error handling
      case instead of 0, as done elsewhere in this function.
      
      Fixes: 712c3185 ("net: thunderx: Program LMAC credits based on MTU")
      Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      60dce04b
    • Wei Yongjun's avatar
      sfc: efx_get_phys_port_id() can be static · b40296fc
      Wei Yongjun authored
      Fixes the following sparse warning:
      
      drivers/net/ethernet/sfc/efx.c:2337:5: warning:
       symbol 'efx_get_phys_port_id' was not declared. Should it be static?
      Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b40296fc
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 02ac5d14
      David S. Miller authored
      Two AF_* families adding entries to the lockdep tables
      at the same time.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      02ac5d14
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · ba836a6f
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "27 fixes.
      
        There are three patches that aren't actually fixes. They're simple
        function renamings which are nice-to-have in mainline as ongoing net
        development depends on them."
      
      * akpm: (27 commits)
        timerfd: export defines to userspace
        mm/hugetlb.c: fix reservation race when freeing surplus pages
        mm/slab.c: fix SLAB freelist randomization duplicate entries
        zram: support BDI_CAP_STABLE_WRITES
        zram: revalidate disk under init_lock
        mm: support anonymous stable page
        mm: add documentation for page fragment APIs
        mm: rename __page_frag functions to __page_frag_cache, drop order from drain
        mm: rename __alloc_page_frag to page_frag_alloc and __free_page_frag to page_frag_free
        mm, memcg: fix the active list aging for lowmem requests when memcg is enabled
        mm: don't dereference struct page fields of invalid pages
        mailmap: add codeaurora.org names for nameless email commits
        signal: protect SIGNAL_UNKILLABLE from unintentional clearing.
        mm: pmd dirty emulation in page fault handler
        ipc/sem.c: fix incorrect sem_lock pairing
        lib/Kconfig.debug: fix frv build failure
        mm: get rid of __GFP_OTHER_NODE
        mm: fix remote numa hits statistics
        mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
        ocfs2: fix crash caused by stale lvb with fsdlm plugin
        ...
      ba836a6f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · cff3b2c4
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix rtlwifi crash, from Larry Finger.
      
       2) Memory disclosure in appletalk ipddp routing code, from Vlad
          Tsyrklevich.
      
       3) r8152 can erroneously split an RX packet into multiple URBs if the
          Rx FIFO is not empty when we suspend. Fix this by waiting for the
          FIFO to empty before suspending. From Hayes Wang.
      
       4) Two GRO fixes (enter slow path when not enough SKB tail room exists,
          disable frag0 optimizations when there are IPV6 extension headers)
          from Eric Dumazet and Herbert Xu.
      
       5) A series of mlx5e bug fixes (do source udp port offloading for
          tunnels properly, Ip fragment matching fixes, handling firmware
          errors properly when installing TC rules, etc.) from Saeed Mahameed,
          Or Gerlitz, Roi Dayan, Hadar Hen Zion, Gil Rockah, and Daniel
          Jurgens.
      
       6) Two VRF fixes from David Ahern (don't skip multipath selection for
          VRF paths, disallow VRF to be configured with table ID 0).
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
        net: vrf: do not allow table id 0
        net: phy: marvell: fix Marvell 88E1512 used in SGMII mode
        sctp: Fix spelling mistake: "Atempt" -> "Attempt"
        net: ipv4: Fix multipath selection with vrf
        cgroup: move CONFIG_SOCK_CGROUP_DATA to init/Kconfig
        gro: use min_t() in skb_gro_reset_offset()
        net/mlx5: Only cancel recovery work when cleaning up device
        net/mlx5e: Remove WARN_ONCE from adaptive moderation code
        net/mlx5e: Un-register uplink representor on nic_disable
        net/mlx5e: Properly handle FW errors while adding TC rules
        net/mlx5e: Fix kbuild warnings for uninitialized parameters
        net/mlx5e: Set inline mode requirements for matching on IP fragments
        net/mlx5e: Properly get address type of encapsulation IP headers
        net/mlx5e: TC ipv4 tunnel encap offload error flow fixes
        net/mlx5e: Warn when rejecting offload attempts of IP tunnels
        net/mlx5e: Properly handle offloading of source udp port for IP tunnels
        gro: Disable frag0 optimization on IPv6 ext headers
        gro: Enter slow-path if there is no tailroom
        mlx4: Return EOPNOTSUPP instead of ENOTSUPP
        net/af_iucv: don't use paged skbs for TX on HiperSockets
        ...
      cff3b2c4
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a6b6e616
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "This fixes a regression in aesni that renders it useless if it's
        built-in with a modular pcbc configuration"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: aesni - Fix failure when built-in with modular pcbc
      a6b6e616
    • David S. Miller's avatar
      Merge branch 'cls_flower-ARP' · 265592a1
      David S. Miller authored
      Simon Horman says:
      
      ====================
      net/sched: cls_flower: Support matching ARP
      
      Add support for support matching on ARP operation, and hardware and
      protocol addresses for Ethernet hardware and IPv4 protocol addresses.
      
      Changes since RFC:
      * None other than dropping RFC designation after positive feedback from Jiri
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      265592a1
    • Simon Horman's avatar
      net/sched: cls_flower: Support matching on ARP · 99d31326
      Simon Horman authored
      Support matching on ARP operation, and hardware and protocol addresses
      for Ethernet hardware and IPv4 protocol addresses.
      
      Example usage:
      
      tc qdisc add dev eth0 ingress
      
      tc filter add dev eth0 protocol arp parent ffff: flower indev eth0 \
      	arp_op request arp_sip 10.0.0.1 action drop
      tc filter add dev eth0 protocol rarp parent ffff: flower indev eth0 \
      	arp_op reply arp_tha 52:54:3f:00:00:00/24 action drop
      Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
      Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      99d31326
    • Simon Horman's avatar
      flow disector: ARP support · 55733350
      Simon Horman authored
      Allow dissection of (R)ARP operation hardware and protocol addresses
      for Ethernet hardware and IPv4 protocol addresses.
      
      There are currently no users of FLOW_DISSECTOR_KEY_ARP.
      A follow-up patch will allow FLOW_DISSECTOR_KEY_ARP to be used by the
      flower classifier.
      Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
      Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55733350
    • Keerthy's avatar
      net: netcp: correct netcp_get_stats function signature · 380043b9
      Keerthy authored
      Commit: bc1f4470 - net: make ndo_get_stats64 a void function
      and
      Commit: 6a8162e9 - net: netcp: store network statistics in 64 bits.
      
      The commit 6a8162e9 adds ndo_get_stats64 function as per old
      signature which causes compilation error:
      
      drivers/net/ethernet/ti/netcp_core.c:1951:28: error:
      initialization from incompatible pointer type
        .ndo_get_stats64        = netcp_get_stats,
      
      Hence correct netcp_get_stats function signature as per
      the latest definition.
      Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
      Fixes: 6a8162e9 ("net: netcp: store network statistics in 64 bits")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      380043b9
    • David Ahern's avatar
      net: vrf: do not allow table id 0 · 24c63bbc
      David Ahern authored
      Frank reported that vrf devices can be created with a table id of 0.
      This breaks many of the run time table id checks and should not be
      allowed. Detect this condition at create time and fail with EINVAL.
      
      Fixes: 193125db ("net: Introduce VRF device driver")
      Reported-by: default avatarFrank Kellermann <frank.kellermann@atos.net>
      Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      24c63bbc