diff options
| author | David S. Miller | 2017-11-10 02:00:18 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-11-10 02:00:18 +0100 |
| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch) | |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 /include/linux/skbuff.h | |
| parent | Merge branch 'dsa-setup-stage' (diff) | |
| parent | Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| download | kernel-qcow2-linux-4dc6758d7824a6d25717ccceefc488cafdb07210.tar.gz kernel-qcow2-linux-4dc6758d7824a6d25717ccceefc488cafdb07210.tar.xz kernel-qcow2-linux-4dc6758d7824a6d25717ccceefc488cafdb07210.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.
Must easier to resolve this time.
Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 03634ec2f918..57d712671081 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3841,6 +3841,13 @@ static inline void nf_reset_trace(struct sk_buff *skb) #endif } +static inline void ipvs_reset(struct sk_buff *skb) +{ +#if IS_ENABLED(CONFIG_IP_VS) + skb->ipvs_property = 0; +#endif +} + /* Note: This doesn't put any conntrack and bridge info in dst. */ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, bool copy) |