diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
| commit | 42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch) | |
| tree | 51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /include/net/net_namespace.h | |
| parent | a81fef347b32dea2b31275826afe1c93fa0d2d54 (diff) | |
| parent | 9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff) | |
| download | linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 79387f73f875..5f9eb260990f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -9,6 +9,7 @@ #include <linux/list.h> #include <linux/sysctl.h> +#include <net/flow.h> #include <net/netns/core.h> #include <net/netns/mib.h> #include <net/netns/unix.h> @@ -131,14 +132,6 @@ struct net { atomic_t fnhe_genid; }; -/* - * ifindex generation is per-net namespace, and loopback is - * always the 1st device in ns (see net_dev_init), thus any - * loopback device should get ifindex 1 - */ - -#define LOOPBACK_IFINDEX 1 - #include <linux/seq_file_net.h> /* Init's network namespace */ |