Pick up the latest upstream fixes.
Showing the changes to include/uapi/linux (4 of 331 files). Show all
Unified · Split
| @@ -2,6 +2,7 @@ · 1 unmodified line | |||
| 2 | #define _UAPI_CM4000_H_ | 2 | #define _UAPI_CM4000_H_ |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/ioctl.h> | ||
| 5 | 6 | ||
| 6 | #define MAX_ATR 33 | 7 | #define MAX_ATR 33 |
| 7 | 8 | ||
| @@ -133,4 +133,38 @@ struct ip_beet_phdr { · 132 unmodified lines | |||
| 133 | __u8 reserved; | 133 | __u8 reserved; |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | /* index values for the variables in ipv4_devconf */ | ||
| 137 | enum | ||
| 138 | { | ||
| 139 | IPV4_DEVCONF_FORWARDING=1, | ||
| 140 | IPV4_DEVCONF_MC_FORWARDING, | ||
| 141 | IPV4_DEVCONF_PROXY_ARP, | ||
| 142 | IPV4_DEVCONF_ACCEPT_REDIRECTS, | ||
| 143 | IPV4_DEVCONF_SECURE_REDIRECTS, | ||
| 144 | IPV4_DEVCONF_SEND_REDIRECTS, | ||
| 145 | IPV4_DEVCONF_SHARED_MEDIA, | ||
| 146 | IPV4_DEVCONF_RP_FILTER, | ||
| 147 | IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, | ||
| 148 | IPV4_DEVCONF_BOOTP_RELAY, | ||
| 149 | IPV4_DEVCONF_LOG_MARTIANS, | ||
| 150 | IPV4_DEVCONF_TAG, | ||
| 151 | IPV4_DEVCONF_ARPFILTER, | ||
| 152 | IPV4_DEVCONF_MEDIUM_ID, | ||
| 153 | IPV4_DEVCONF_NOXFRM, | ||
| 154 | IPV4_DEVCONF_NOPOLICY, | ||
| 155 | IPV4_DEVCONF_FORCE_IGMP_VERSION, | ||
| 156 | IPV4_DEVCONF_ARP_ANNOUNCE, | ||
| 157 | IPV4_DEVCONF_ARP_IGNORE, | ||
| 158 | IPV4_DEVCONF_PROMOTE_SECONDARIES, | ||
| 159 | IPV4_DEVCONF_ARP_ACCEPT, | ||
| 160 | IPV4_DEVCONF_ARP_NOTIFY, | ||
| 161 | IPV4_DEVCONF_ACCEPT_LOCAL, | ||
| 162 | IPV4_DEVCONF_SRC_VMARK, | ||
| 163 | IPV4_DEVCONF_PROXY_ARP_PVLAN, | ||
| 164 | IPV4_DEVCONF_ROUTE_LOCALNET, | ||
| 165 | __IPV4_DEVCONF_MAX | ||
| 166 | }; | ||
| 167 | |||
| 168 | #define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1) | ||
| 169 | |||
| 136 | #endif /* _UAPI_LINUX_IP_H */ | 170 | #endif /* _UAPI_LINUX_IP_H */ |
| @@ -73,9 +73,17 @@ struct tc_estimator { · 72 unmodified lines | |||
| 73 | #define TC_H_ROOT (0xFFFFFFFFU) | 73 | #define TC_H_ROOT (0xFFFFFFFFU) |
| 74 | #define TC_H_INGRESS (0xFFFFFFF1U) | 74 | #define TC_H_INGRESS (0xFFFFFFF1U) |
| 75 | 75 | ||
| 76 | /* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */ | ||
| 77 | enum tc_link_layer { | ||
| 78 | TC_LINKLAYER_UNAWARE, /* Indicate unaware old iproute2 util */ | ||
| 79 | TC_LINKLAYER_ETHERNET, | ||
| 80 | TC_LINKLAYER_ATM, | ||
| 81 | }; | ||
| 82 | #define TC_LINKLAYER_MASK 0x0F /* limit use to lower 4 bits */ | ||
| 83 | |||
| 76 | struct tc_ratespec { | 84 | struct tc_ratespec { |
| 77 | unsigned char cell_log; | 85 | unsigned char cell_log; |
| 78 | unsigned char __reserved; | 86 | __u8 linklayer; /* lower 4 bits */ |
| 79 | unsigned short overhead; | 87 | unsigned short overhead; |
| 80 | short cell_align; | 88 | short cell_align; |
| 81 | unsigned short mpu; | 89 | unsigned short mpu; |
| @@ -253,7 +253,7 @@ enum · 252 unmodified lines | |||
| 253 | LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */ | 253 | LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */ |
| 254 | LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */ | 254 | LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */ |
| 255 | LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */ | 255 | LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */ |
| 256 | LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */ | 256 | LINUX_MIB_BUSYPOLLRXPACKETS, /* BusyPollRxPackets */ |
| 257 | __LINUX_MIB_MAX | 257 | __LINUX_MIB_MAX |
| 258 | }; | 258 | }; |
| 259 | 259 | ||