target/linux/generic/backport-4.14/360-v4.18-netfilter-nf_flow_table-make-flow_offload_dead-inlin.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Sun, 25 Feb 2018 15:37:27 +0100
   3 Subject: [PATCH] netfilter: nf_flow_table: make flow_offload_dead inline
   4
   5 It is too trivial to keep as a separate exported function
   6
   7 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   8 ---
   9
  10 --- a/include/net/netfilter/nf_flow_table.h
  11 +++ b/include/net/netfilter/nf_flow_table.h
  12 @@ -103,7 +103,10 @@ void nf_flow_table_cleanup(struct net *n
  13  int nf_flow_table_init(struct nf_flowtable *flow_table);
  14  void nf_flow_table_free(struct nf_flowtable *flow_table);
  15
  16 -void flow_offload_dead(struct flow_offload *flow);
  17 +static inline void flow_offload_dead(struct flow_offload *flow)
  18 +{
  19 +       flow->flags |= FLOW_OFFLOAD_DYING;
  20 +}
  21
  22  int nf_flow_snat_port(const struct flow_offload *flow,
  23                       struct sk_buff *skb, unsigned int thoff,
  24 --- a/net/netfilter/nf_flow_table_core.c
  25 +++ b/net/netfilter/nf_flow_table_core.c
  26 @@ -113,12 +113,6 @@ void flow_offload_free(struct flow_offlo
  27  }
  28  EXPORT_SYMBOL_GPL(flow_offload_free);
  29
  30 -void flow_offload_dead(struct flow_offload *flow)
  31 -{
  32 -       flow->flags |= FLOW_OFFLOAD_DYING;
  33 -}
  34 -EXPORT_SYMBOL_GPL(flow_offload_dead);
  35 -
  36  static u32 flow_offload_hash(const void *data, u32 len, u32 seed)
  37  {
  38         const struct flow_offload_tuple *tuple = data;