diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
| commit | d8e6d09cfa7260b12501ce94ca35977be998d4a7 (patch) | |
| tree | 1fe3a34e78b5978fe95fb6ba96f7d070778d5c7a /net/core/skbuff.c | |
| parent | c0426ccf530144f8af2e68165aa10cc52cd8f803 (diff) | |
| parent | 29ffb9c1fb4acbda207985ad1558191ffb776bee (diff) | |
Merge tag 'v4.4.102' into linux-linaro-lsk-v4.4lsk-v4.4-17.11
This is the 4.4.102 stable release
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 73dfd7729bc9..d33609c2f276 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4229,6 +4229,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) if (!xnet) return; + ipvs_reset(skb); skb_orphan(skb); skb->mark = 0; } |