1. 31 Mar, 2019 3 commits
  2. 29 Mar, 2019 34 commits
  3. 28 Mar, 2019 3 commits
    • Yi-Hung Wei's avatar
      openvswitch: Add timeout support to ct action · 06bd2bdf
      Yi-Hung Wei authored
      Add support for fine-grain timeout support to conntrack action.
      The new OVS_CT_ATTR_TIMEOUT attribute of the conntrack action
      specifies a timeout to be associated with this connection.
      If no timeout is specified, it acts as is, that is the default
      timeout for the connection will be automatically applied.
      
      Example usage:
      $ nfct timeout add timeout_1 inet tcp syn_sent 100 established 200
      $ ovs-ofctl add-flow br0 in_port=1,ip,tcp,action=ct(commit,timeout=timeout_1)
      
      CC: Pravin Shelar <pshelar@ovn.org>
      CC: Pablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarYi-Hung Wei <yihung.wei@gmail.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06bd2bdf
    • Yi-Hung Wei's avatar
      netfilter: Export nf_ct_{set,destroy}_timeout() · 717700d1
      Yi-Hung Wei authored
      This patch exports nf_ct_set_timeout() and nf_ct_destroy_timeout().
      The two functions are derived from xt_ct_destroy_timeout() and
      xt_ct_set_timeout() in xt_CT.c, and moved to nf_conntrack_timeout.c
      without any functional change.
      It would be useful for other users (i.e. OVS) that utilizes the
      finer-grain conntrack timeout feature.
      
      CC: Pablo Neira Ayuso <pablo@netfilter.org>
      CC: Pravin Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarYi-Hung Wei <yihung.wei@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      717700d1
    • David S. Miller's avatar
      Merge branch 's390-next' · c63d11ba
      David S. Miller authored
      Julian Wiedmann says:
      
      ====================
      s390/qeth: updates 2019-03-28
      
      please apply the following patchset to net-next. This reworks the control
      IO code in qeth so that we no longer need to poll for cmd completion,
      and refactors the IDX setup code to also use this improved IO path.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c63d11ba