Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c
Showing the changes to include/uapi/linux (2 of 62 files). Show all
Unified · Split
| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | # UAPI Header export list |
| 2 | 2 | header-y += tc_csum.h |
| 3 | +header-y += tc_defact.h | |
| 3 | 4 | header-y += tc_gact.h |
| 4 | 5 | header-y += tc_ipt.h |
| 5 | 6 | header-y += tc_mirred.h |
| @@ -0,0 +1,19 @@ | ||
| 1 | +#ifndef __LINUX_TC_DEF_H | |
| 2 | +#define __LINUX_TC_DEF_H | |
| 3 | + | |
| 4 | +#include <linux/pkt_cls.h> | |
| 5 | + | |
| 6 | +struct tc_defact { | |
| 7 | + tc_gen; | |
| 8 | +}; | |
| 9 | + | |
| 10 | +enum { | |
| 11 | + TCA_DEF_UNSPEC, | |
| 12 | + TCA_DEF_TM, | |
| 13 | + TCA_DEF_PARMS, | |
| 14 | + TCA_DEF_DATA, | |
| 15 | + __TCA_DEF_MAX | |
| 16 | +}; | |
| 17 | +#define TCA_DEF_MAX (__TCA_DEF_MAX - 1) | |
| 18 | + | |
| 19 | +#endif | |