diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-08-27 19:20:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-08-27 19:20:10 -0700 |
| commit | 48e24acb2360c5b74a0b5fb12d9d4c34d7692212 (patch) | |
| tree | 34603b14d84f679738e831475e4f0d874aa74caf /include/linux | |
| parent | 0092e993bbfeb409fe4e7c274acd93bcac32e371 (diff) | |
| parent | 4f6aeb92a80f4e8084455b67d295bb80f031c375 (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6t_REJECT.h | 16 | ||||
| -rw-r--r-- | include/linux/netlink.h | 7 | ||||
| -rw-r--r-- | include/linux/pkt_sched.h | 25 |
3 files changed, 25 insertions, 23 deletions
diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/linux/netfilter_ipv6/ip6t_REJECT.h deleted file mode 100644 index d1d72d0e9562..000000000000 --- a/include/linux/netfilter_ipv6/ip6t_REJECT.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _IP6T_REJECT_H -#define _IP6T_REJECT_H - -enum ip6t_reject_with { - IP6T_ICMP_NET_UNREACHABLE, - IP6T_ICMP_HOST_UNREACHABLE, - IP6T_ICMP_PROT_UNREACHABLE, - IP6T_ICMP_PORT_UNREACHABLE, - IP6T_ICMP_ECHOREPLY -}; - -struct ip6t_reject_info { - enum ip6t_reject_with with; /* reject type */ -}; - -#endif /*_IPT_REJECT_H*/ diff --git a/include/linux/netlink.h b/include/linux/netlink.h index ee61b0f31174..01864a8fd17f 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -134,13 +134,6 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long t void netlink_detachskb(struct sock *sk, struct sk_buff *skb); int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); -/* finegrained unicast helpers: */ -struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid); -struct sock *netlink_getsockbyfilp(struct file *filp); -int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo); -void netlink_detachskb(struct sock *sk, struct sk_buff *skb); -int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); - /* * skb should fit one page. This choice is good for headerless malloc. * diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index d98d8cfcd08d..386d85c0c68c 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -402,6 +402,16 @@ enum { #define TCA_ATM_MAX TCA_ATM_STATE /* Network emulator */ + +enum +{ + TCA_NETEM_UNSPEC, + TCA_NETEM_CORR, + TCA_NETEM_DELAY_DIST, +}; + +#define TCA_NETEM_MAX TCA_NETEM_DELAY_DIST + struct tc_netem_qopt { __u32 latency; /* added delay (us) */ @@ -411,4 +421,19 @@ struct tc_netem_qopt __u32 duplicate; /* random packet dup (0=none ~0=100%) */ __u32 jitter; /* random jitter in latency (us) */ }; + +struct tc_netem_corr +{ + __u32 delay_corr; /* delay correlation */ + __u32 loss_corr; /* packet loss correlation */ + __u32 dup_corr; /* duplicate correlation */ +}; + +struct tc_netem_dist +{ + __u32 size; /* table size */ + __u32 factor; /* table scaling factor */ + __s16 data[0]; /* distribution table values */ +}; + #endif |