Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9636e558 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "include: fib: Remove the deprecated UID fields"

parents 0be1bf53 8a5ac28a

include/net/fib_rules.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ struct fib_rules_ops { 
	[FRA_FWMARK]	= { .type = NLA_U32 }, \

	[FRA_FWMASK]	= { .type = NLA_U32 }, \

	[FRA_TABLE]     = { .type = NLA_U32 }, \

	[FRA_UID_START]	= { .type = NLA_U32 }, \

	[FRA_UID_END]	= { .type = NLA_U32 }, \

	[FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 }, \

	[FRA_SUPPRESS_IFGROUP] = { .type = NLA_U32 }, \

	[FRA_GOTO]	= { .type = NLA_U32 }, \

include/uapi/linux/fib_rules.h

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ enum { 
	FRA_TABLE,	/* Extended table id */

	FRA_FWMASK,	/* mask for netfilter mark */

	FRA_OIFNAME,

	FRA_UID_START,	/* UID range */

	FRA_UID_END,

	FRA_PAD,

	FRA_L3MDEV,	/* iif or oif is l3mdev goto its table */

	FRA_UID_RANGE,	/* UID range */