diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-09 21:23:31 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-09 23:03:34 +0200 |
| commit | 5817d20602b7a10b4860388b71389a3b08107149 (patch) | |
| tree | c5432328eadab7db5d568d7fbebd428abd983030 | |
| parent | f28b2baa6fc248672aa1475af578a60757dba410 (diff) | |
backports: skbuff.h: Add nf_reset_ct()
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>
| -rw-r--r-- | backport/backport-include/linux/skbuff.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 */ |