1. 01 Jul, 2017 33 commits
  2. 30 Jun, 2017 7 commits
    • David S. Miller's avatar
      Merge branch 'PTP-support-for-macb-driver' · 574a6020
      David S. Miller authored
      Rafal Ozieblo says:
      
      ====================
      PTP support for macb driver
      
      This patch series adds support for PTP synchronization protocol
      in Cadence GEM driver based on PHC.
      
      v2 changes:
      * removed alarm's support
      * removed external time stamp support
      * removed PTP event interrupt handling
      * removed ptp_hw_support flag
      * removed all extra sanity checks
      * removed unnecessary #ifdef
      * fixed coding style and alligment issues
      * renamed macb.c to macb_main.c
      
      v3 changes:
      * added checking NULL ptr from ptp_clock_register()
      * fixed error codes return
      * locals list in "upside down Christmas tree" style
      * fixed some other issues from review
      
      v4 changes:
      * respin to the newest next-next (28 Jun 2017)
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      574a6020
    • Rafal Ozieblo's avatar
      net: macb: Add hardware PTP support · ab91f0a9
      Rafal Ozieblo authored
      This patch is based on original Harini's patch and Andrei's patch,
      implemented in a separate file to ease the review/maintanance
      and integration with other platforms.
      
      This driver supports GEM-GXL:
      - Register ptp clock framework
      - Initialize PTP related registers
      - HW time stamp on the PTP Ethernet packets are received using the
        SO_TIMESTAMPING API. Time stamps are obtained from the dma buffer
        descriptors
      - add macb_ptp to compilation chain
      Signed-off-by: default avatarRafal Ozieblo <rafalo@cadence.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ab91f0a9
    • Rafal Ozieblo's avatar
      net: macb: macb.c changed to macb_main.c · b83f1527
      Rafal Ozieblo authored
      In case that macb is compiled as a module, macb.c has been renamed to
      macb_main.c to avoid naming confusion in Makefile.
      Signed-off-by: default avatarRafal Ozieblo <rafalo@cadence.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b83f1527
    • Rafal Ozieblo's avatar
      08729fde
    • Rafal Ozieblo's avatar
      net: macb: Add support for PTP timestamps in DMA descriptors · 7b429614
      Rafal Ozieblo authored
      This patch adds support for PTP timestamps in
      DMA buffer descriptors. It checks capability at runtime
      and uses appropriate buffer descriptor.
      Signed-off-by: default avatarRafal Ozieblo <rafalo@cadence.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b429614
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b0791159
      David S. Miller authored
      A set of overlapping changes in macvlan and the rocker
      driver, nothing serious.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b0791159
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 52a623bd
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for your net-next
      tree. This batch contains connection tracking updates for the cleanup
      iteration path, patches from Florian Westphal:
      
      X) Skip unconfirmed conntracks in nf_ct_iterate_cleanup_net(), just set
         dying bit to let the CPU release them.
      
      X) Add nf_ct_iterate_destroy() to be used on module removal, to kill
         conntrack from all namespace.
      
      X) Restart iteration on hashtable resizing, since both may occur at
         the same time.
      
      X) Use the new nf_ct_iterate_destroy() to remove conntrack with NAT
         mapping on module removal.
      
      X) Use nf_ct_iterate_destroy() to remove conntrack entries helper
         module removal, from Liping Zhang.
      
      X) Use nf_ct_iterate_cleanup_net() to remove the timeout extension
         if user requests this, also from Liping.
      
      X) Add net_ns_barrier() and use it from FTP helper, so make sure
         no concurrent namespace removal happens at the same time while
         the helper module is being removed.
      
      X) Use NFPROTO_MAX in layer 3 conntrack protocol array, to reduce
         module size. Same thing in nf_tables.
      
      Updates for the nf_tables infrastructure:
      
      X) Prepare usage of the extended ACK reporting infrastructure for
         nf_tables.
      
      X) Remove unnecessary forward declaration in nf_tables hash set.
      
      X) Skip set size estimation if number of element is not specified.
      
      X) Changes to accomodate a (faster) unresizable hash set implementation,
         for anonymous sets and dynamic size fixed sets with no timeouts.
      
      X) Faster lookup function for unresizable hash table for 2 and 4
         bytes key.
      
      And, finally, a bunch of asorted small updates and cleanups:
      
      X) Do not hold reference to netdev from ipt_CLUSTER, instead subscribe
         to device events and look up for index from the packet path, this
         is fixing an issue that is present since the very beginning, patch
         from Xin Long.
      
      X) Use nf_register_net_hook() in ipt_CLUSTER, from Florian Westphal.
      
      X) Use ebt_invalid_target() whenever possible in the ebtables tree,
         from Gao Feng.
      
      X) Calm down compilation warning in nf_dup infrastructure, patch from
         stephen hemminger.
      
      X) Statify functions in nftables rt expression, also from stephen.
      
      X) Update Makefile to use canonical method to specify nf_tables-objs.
         From Jike Song.
      
      X) Use nf_conntrack_helpers_register() in amanda and H323.
      
      X) Space cleanup for ctnetlink, from linzhang.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      52a623bd