diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:08:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:08:51 +0100 |
| commit | 94e14da890b1b68526b5f87ff1c97f374fd2471e (patch) | |
| tree | ad17c794208b02cd2ae24d67ab7e9c14c2fd43c5 /include/net/sock.h | |
| parent | 5367601b52696004f363e4f6c0b228b5bbf7d8b7 (diff) | |
| parent | d1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff) | |
Merge 5.5-rc2 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 87d54ef57f00..80f996406bba 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2305,7 +2305,7 @@ struct sock_skb_cb { * using skb->cb[] would keep using it directly and utilize its * alignement guarantee. */ -#define SOCK_SKB_CB_OFFSET ((FIELD_SIZEOF(struct sk_buff, cb) - \ +#define SOCK_SKB_CB_OFFSET ((sizeof_field(struct sk_buff, cb) - \ sizeof(struct sock_skb_cb))) #define SOCK_SKB_CB(__skb) ((struct sock_skb_cb *)((__skb)->cb + \ |