diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/net_namespace.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/bpf.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 4a9da951a794..cb668bc2692d 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -61,7 +61,6 @@ struct net { | |||
61 | spinlock_t rules_mod_lock; | 61 | spinlock_t rules_mod_lock; |
62 | 62 | ||
63 | u32 hash_mix; | 63 | u32 hash_mix; |
64 | atomic64_t cookie_gen; | ||
65 | 64 | ||
66 | struct list_head list; /* list of network namespaces */ | 65 | struct list_head list; /* list of network namespaces */ |
67 | struct list_head exit_list; /* To linked to call pernet exit | 66 | struct list_head exit_list; /* To linked to call pernet exit |
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index fa1c753dcdbc..a5aa7d3ac6a1 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h | |||
@@ -1466,8 +1466,8 @@ union bpf_attr { | |||
1466 | * If no cookie has been set yet, generate a new cookie. Once | 1466 | * If no cookie has been set yet, generate a new cookie. Once |
1467 | * generated, the socket cookie remains stable for the life of the | 1467 | * generated, the socket cookie remains stable for the life of the |
1468 | * socket. This helper can be useful for monitoring per socket | 1468 | * socket. This helper can be useful for monitoring per socket |
1469 | * networking traffic statistics as it provides a unique socket | 1469 | * networking traffic statistics as it provides a global socket |
1470 | * identifier per namespace. | 1470 | * identifier that can be assumed unique. |
1471 | * Return | 1471 | * Return |
1472 | * A 8-byte long non-decreasing number on success, or 0 if the | 1472 | * A 8-byte long non-decreasing number on success, or 0 if the |
1473 | * socket field is missing inside *skb*. | 1473 | * socket field is missing inside *skb*. |