diff options
author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /include/net/net_namespace.h | |
parent | cd9063757a227cf31ebf5391ccda2bf583b0806e (diff) | |
parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'include/net/net_namespace.h')
-rw-r--r-- | include/net/net_namespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index a68ced28d8f4..12689ddfc24c 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -59,6 +59,7 @@ struct net { */ spinlock_t rules_mod_lock; + u32 hash_mix; atomic64_t cookie_gen; struct list_head list; /* list of network namespaces */ |