diff options
| author | Borislav Petkov <bp@suse.de> | 2016-11-23 21:13:40 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2016-11-23 21:13:40 +0100 |
| commit | 627bc29ed90ca50dbf7a4e7b43c267a2920bbadb (patch) | |
| tree | 838d8aca5a04166b6ad74a2ef0f5291224768501 /include/uapi/linux/rtnetlink.h | |
| parent | 044e7a414be9ba20826e5fd482214686193fe7b6 (diff) | |
| parent | 3f5a7896a5096fd50030a04d4c3f28a7441e30a5 (diff) | |
Merge tip:ras/core to pick up dependent changes
tip:ras/core contains the respective Fam17h x86 RAS bits which
amd64_edac is going to use. So merge it into the EDAC branch.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/uapi/linux/rtnetlink.h')
| -rw-r--r-- | include/uapi/linux/rtnetlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 262f0379d83a..5a78be518101 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -350,7 +350,7 @@ struct rtnexthop { #define RTNH_F_OFFLOAD 8 /* offloaded route */ #define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */ -#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN) +#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD) /* Macros to handle hexthops */ |