| Message ID | 20191009211207.29212-1-hauke@hauke-m.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] backports: skbuff.h: Add nf_reset_ct() | expand |
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 41e5724b..42b048ad 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -398,6 +398,12 @@ static inline unsigned int skb_frag_off(const skb_frag_t *frag) { return frag->page_offset; } + +#define nf_reset_ct LINUX_BACKPORT(nf_reset_ct) +static inline void nf_reset_ct(struct sk_buff *skb) +{ + nf_reset(skb); +} #endif #endif /* __BACKPORT_SKBUFF_H */
nf_reset_ct() was added in upstream Linux commit 895b5c9f206e ("netfilter: drop bridge nf reset from nf_reset") and is now used by mac80211_hwsim. The upstream commit renamed nf_reset() to nf_reset_ct() and did some modifications to this inline function, just call the old version on older kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/skbuff.h | 6 ++++++ 1 file changed, 6 insertions(+)