Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[J-linux.git] / include / linux / skbuff.h

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b945af8a620881ad07ed465cc1c46a2cf6d95333..517e546a120aec086b45657d73761a5c90f5f475 100644 (file)
--- 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;