diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-12-15 02:23:01 +0900 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-23 13:49:44 +0200 |
| commit | 90f539dbad9659112b649839b00f1897b7b2a6dc (patch) | |
| tree | 000b7e58459d6208719e9a356b2e91c3f2a423b4 /include/net/flow.h | |
| parent | b954b39e597615744e6e8d45215bccf1bdfdb034 (diff) | |
Revert "net: core: Support UID-based routing."
This reverts commit f6f535d3e0d8da2b5bc3c93690c47485d29e4ce6.
Bug: 16355602
Change-Id: I5987e276f5ddbe425ea3bd86861cee0ae22212d9
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index 1426681f7..0eb5516a4 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -10,7 +10,6 @@ #include <linux/socket.h> #include <linux/in6.h> #include <linux/atomic.h> -#include <linux/uidgid.h> /* * ifindex generation is per-net namespace, and loopback is @@ -32,7 +31,6 @@ struct flowi_common { #define FLOWI_FLAG_CAN_SLEEP 0x02 #define FLOWI_FLAG_KNOWN_NH 0x04 __u32 flowic_secid; - kuid_t flowic_uid; }; union flowi_uli { @@ -69,7 +67,6 @@ struct flowi4 { #define flowi4_proto __fl_common.flowic_proto #define flowi4_flags __fl_common.flowic_flags #define flowi4_secid __fl_common.flowic_secid -#define flowi4_uid __fl_common.flowic_uid /* (saddr,daddr) must be grouped, same order as in IP header */ __be32 saddr; @@ -89,8 +86,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, __u32 mark, __u8 tos, __u8 scope, __u8 proto, __u8 flags, __be32 daddr, __be32 saddr, - __be16 dport, __be16 sport, - kuid_t uid) + __be16 dport, __be16 sport) { fl4->flowi4_oif = oif; fl4->flowi4_iif = LOOPBACK_IFINDEX; @@ -100,7 +96,6 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, fl4->flowi4_proto = proto; fl4->flowi4_flags = flags; fl4->flowi4_secid = 0; - fl4->flowi4_uid = uid; fl4->daddr = daddr; fl4->saddr = saddr; fl4->fl4_dport = dport; @@ -128,7 +123,6 @@ struct flowi6 { #define flowi6_proto __fl_common.flowic_proto #define flowi6_flags __fl_common.flowic_flags #define flowi6_secid __fl_common.flowic_secid -#define flowi6_uid __fl_common.flowic_uid struct in6_addr daddr; struct in6_addr saddr; __be32 flowlabel; @@ -172,7 +166,6 @@ struct flowi { #define flowi_proto u.__fl_common.flowic_proto #define flowi_flags u.__fl_common.flowic_flags #define flowi_secid u.__fl_common.flowic_secid -#define flowi_uid u.__fl_common.flowic_uid } __attribute__((__aligned__(BITS_PER_LONG/8))); static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4) |