diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-09 23:27:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-09 23:27:14 +0100 |
| commit | 8a8317f92770ab70ff39b15de74bdb3a07fdb6cb (patch) | |
| tree | ce65ca0b98c15e7358925ecba5273eefb1b50256 /include/linux/skbuff.h | |
| parent | aad6b35290f52639d3601063d33d9621c0948a04 (diff) | |
| parent | f63eb9ae085dc6da27eebfe35317e07a6a02a160 (diff) | |
regmap: kunit: Add some test cases and a few small
Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>:
This series adds some more test cases, mainly for testing:
commit eaa03486d932 ("regmap: maple: Fix uninitialized symbol 'ret' warnings")
commit 00bb549d7d63 ("regmap: maple: Fix cache corruption in regcache_maple_drop()")
And the pending patch ("regmap: Add regmap_read_bypassed()")
There are also a few small improvements to the KUnit implementation.
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0c7c67b3a87b..9d24aec064e8 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -753,8 +753,6 @@ typedef unsigned char *sk_buff_data_t; * @list: queue head * @ll_node: anchor in an llist (eg socket defer_list) * @sk: Socket we are owned by - * @ip_defrag_offset: (aka @sk) alternate use of @sk, used in - * fragmentation management * @dev: Device we arrived on/are leaving by * @dev_scratch: (aka @dev) alternate use of @dev when @dev would be %NULL * @cb: Control buffer. Free for use by every layer. Put private vars here @@ -875,10 +873,7 @@ struct sk_buff { struct llist_node ll_node; }; - union { - struct sock *sk; - int ip_defrag_offset; - }; + struct sock *sk; union { ktime_t tstamp; |