diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2012-04-10 09:11:21 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-04-10 09:11:21 -0700 |
| commit | 29cea29df0dfe45562fd42673e26608d25180eee (patch) | |
| tree | e4e8a6a56a5963b31e7cb4a131650e1f490f4cb0 | |
| parent | 9fb6dc2bef427f13ad794cad187cda60be1cc06e (diff) | |
| download | android_external_iproute2-29cea29df0dfe45562fd42673e26608d25180eee.tar.gz android_external_iproute2-29cea29df0dfe45562fd42673e26608d25180eee.tar.bz2 android_external_iproute2-29cea29df0dfe45562fd42673e26608d25180eee.zip | |
Merge in 3.3-rc2 kernel headers
| -rw-r--r-- | include/linux/if.h | 2 | ||||
| -rw-r--r-- | include/linux/pkt_sched.h | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index b5084d4..b3383a9 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -80,6 +80,8 @@ * skbs on transmit */ #define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */ #define IFF_TEAM_PORT 0x40000 /* device used as team port */ +#define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ + #define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_PROTO 0x0002 diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 0d5b793..410b33d 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -127,6 +127,27 @@ struct tc_multiq_qopt { __u16 max_bands; /* Maximum number of queues */ }; +/* PLUG section */ + +#define TCQ_PLUG_BUFFER 0 +#define TCQ_PLUG_RELEASE_ONE 1 +#define TCQ_PLUG_RELEASE_INDEFINITE 2 +#define TCQ_PLUG_LIMIT 3 + +struct tc_plug_qopt { + /* TCQ_PLUG_BUFFER: Inset a plug into the queue and + * buffer any incoming packets + * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head + * to beginning of the next plug. + * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue. + * Stop buffering packets until the next TCQ_PLUG_BUFFER + * command is received (just act as a pass-thru queue). + * TCQ_PLUG_LIMIT: Increase/decrease queue size + */ + int action; + __u32 limit; +}; + /* TBF section */ struct tc_tbf_qopt { |