History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 13 years ago

Commit 2ff1cf12 parents 16b304f 0f7dd1a357 files · +3306 −1865Browse files

Showing the changes to include/uapi/linux (2 of 357 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/pkt_sched.h +9 −1
  2. include/uapi/linux/snmp.h +1 −1
include/uapi/linux/pkt_sched.h+9−1
@@ -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" */
77enum 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
76struct tc_ratespec {84struct 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;
include/uapi/linux/snmp.h+1−1
@@ -257,7 +257,7 @@ enum · 256 unmodified lines
257 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */257 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */
258 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */258 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */
259 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */259 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
260 LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */260 LINUX_MIB_BUSYPOLLRXPACKETS, /* BusyPollRxPackets */
261 __LINUX_MIB_MAX261 __LINUX_MIB_MAX
262};262};
263 263