diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index a9e8875e3394..bcf948920812 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -872,7 +872,15 @@ struct sk_buff { struct llist_node ll_node; }; - struct sock *sk; + /* ANDROID: + * Put back the union removed in commit 7d0567842b78 ("inet: + * inet_defrag: prevent sk release while still in use") to preserve the + * crcs of stuff. Does not affect any code functionality. + */ + union { + struct sock *sk; + int ip_defrag_offset; + }; union { ktime_t tstamp;