diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-23 00:15:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-23 00:15:05 +0100 |
| commit | ac80010fc94eb0680d9a432b639583bd7ac29066 (patch) | |
| tree | 2de924c048910abfbfff52a3d5188a790ead379f /net/unix | |
| parent | Merge tag 'wireless-drivers-next-2019-12-20' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | Merge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| download | linux-ac80010fc94eb0680d9a432b639583bd7ac29066.tar.xz linux-ac80010fc94eb0680d9a432b639583bd7ac29066.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Mere overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 050eed3b30dc..6756a3ccc392 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2911,7 +2911,7 @@ static int __init af_unix_init(void) { int rc = -1; - BUILD_BUG_ON(sizeof(struct unix_skb_parms) > FIELD_SIZEOF(struct sk_buff, cb)); + BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof_field(struct sk_buff, cb)); rc = proto_register(&unix_proto, 1); if (rc != 0) { |