1. 02 Nov, 2016 5 commits
    • Xin Long's avatar
      sctp: clean up sctp_packet_transmit · e4ff952a
      Xin Long authored
      After adding sctp gso, sctp_packet_transmit is a quite big function now.
      This patch is to extract the codes for packing packet to sctp_packet_pack
      from sctp_packet_transmit, and add some comments, simplify the err path by
      freeing auth chunk when freeing packet chunk_list in out path and freeing
      head skb early if it fails to pack packet.
      Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
      Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge branch 'cls_flower-misc' · 92901827
      David S. Miller authored
      Roi Dayan says:
      misc TC/flower changes
      This series includes two small changes to the TC flower classifier.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Roi Dayan's avatar
      net/sched: cls_flower: merge filter delete/destroy common code · 13fa876e
      Roi Dayan authored
      Move common code from fl_delete and fl_detroy to __fl_delete.
      Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
      Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Roi Dayan's avatar
      net/sched: cls_flower: add missing unbind call when destroying flows · a1a8f7fe
      Roi Dayan authored
      tcf_unbind was called in fl_delete but was missing in fl_destroy when
      force deleting flows.
      Fixes: 77b9900e
       ('tc: introduce Flower classifier')
      Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 4cb551a1
      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 includes better integration with the routing subsystem for
      nf_tables, explicit notrack support and smaller updates. More
      specifically, they are:
      1) Add fib lookup expression for nf_tables, from Florian Westphal. This
         new expression provides a native replacement for iptables addrtype
         and rp_filter matches. This is more flexible though, since we can
         populate the kernel flowi representation to inquire fib to
         accomodate new usecases, such as RTBH through skb mark.
      2) Introduce rt expression for nf_tables, from Anders K. Pedersen. This
         new expression allow you to access skbuff route metadata, more
         specifically nexthop and classid fields.
      3) Add notrack support for nf_tables, to skip conntracking, requested by
         many users already.
      4) Add boilerplate code to allow to use nf_log infrastructure from
         nf_tables ingress.
      5) Allow to mangle pkttype from nf_tables prerouting chain, to emulate
         the xtables cluster match, from Liping Zhang.
      6) Move socket lookup code into generic nf_socket_* infrastructure so
         we can provide a native replacement for the xtables socket match.
      7) Make sure nfnetlink_queue data that is updated on every packets is
         placed in a different cache from read-only data, from Florian Westphal.
      8) Handle NF_STOLEN from nf_tables core, also from Florian Westphal.
      9) Start round robin number generation in nft_numgen from zero,
         instead of n-1, for consistency with xtables statistics match,
         patch from Liping Zhang.
      10) Set GFP_NOWARN flag in skbuff netlink allocations in nfnetlink_log,
          given we retry with a smaller allocation on failure, from Calvin Owens.
      11) Cleanup xt_multiport to use switch(), from Gao feng.
      12) Remove superfluous check in nft_immediate and nft_cmp, from
          Liping Zhang.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
  2. 01 Nov, 2016 35 commits