diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:27:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:27:38 -0400 |
commit | c1448791648d44ecbf8cadb192704e3e6eb3bb0e (patch) | |
tree | 606cb5289bc8770e925761c6e1617eb44a6dafef /include | |
parent | ac4e0aba7daf0a7c6ac20974070428481dc940f5 (diff) | |
parent | 7b19ffc40b0247fcfe083644fdb621fdb3c05ef6 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (36 commits)
[Bluetooth] Fix HID disconnect NULL pointer dereference
[Bluetooth] Add missing entry for Nokia DTL-4 PCMCIA card
[Bluetooth] Add support for newer ANYCOM USB dongles
[NET]: Can use __get_cpu_var() instead of per_cpu() in loopback driver.
[IPV4] inet_peer: Group together avl_left, avl_right, v4daddr to speedup lookups on some CPUS
[TCP]: One NET_INC_STATS() could be NET_INC_STATS_BH in tcp_v4_err()
[NETFILTER]: Missing check for CAP_NET_ADMIN in iptables compat layer
[NETPOLL]: initialize skb for UDP
[IPV6]: Fix route.c warnings when multiple tables are disabled.
[TG3]: Bump driver version and release date.
[TG3]: Add lower bound checks for tx ring size.
[TG3]: Fix set ring params tx ring size implementation
[NET]: reduce per cpu ram used for loopback stats
[IPv6] route: Fix prohibit and blackhole routing decision
[DECNET]: Fix input routing bug
[TCP]: Bound TSO defer time
[IPv4] fib: Remove unused fib_config members
[IPV6]: Always copy rt->u.dst.error when copying a rt6_info.
[IPV6]: Make IPV6_SUBTREES depend on IPV6_MULTIPLE_TABLES.
[IPV6]: Clean up BACKTRACK().
...
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/tcp.h | 2 | ||||
-rw-r--r-- | include/linux/tipc.h | 1 | ||||
-rw-r--r-- | include/net/inetpeer.h | 7 | ||||
-rw-r--r-- | include/net/ip6_route.h | 7 | ||||
-rw-r--r-- | include/net/ip_fib.h | 5 |
5 files changed, 8 insertions, 14 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 0e058a2d1c6d..2d36f6db3706 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
@@ -342,6 +342,8 @@ struct tcp_sock { | |||
342 | 342 | ||
343 | unsigned long last_synq_overflow; | 343 | unsigned long last_synq_overflow; |
344 | 344 | ||
345 | __u32 tso_deferred; | ||
346 | |||
345 | /* Receiver side RTT estimation */ | 347 | /* Receiver side RTT estimation */ |
346 | struct { | 348 | struct { |
347 | __u32 rtt; | 349 | __u32 rtt; |
diff --git a/include/linux/tipc.h b/include/linux/tipc.h index 243a15f54002..bea469455a0c 100644 --- a/include/linux/tipc.h +++ b/include/linux/tipc.h | |||
@@ -129,6 +129,7 @@ static inline unsigned int tipc_node(__u32 addr) | |||
129 | 129 | ||
130 | #define TIPC_SUB_PORTS 0x01 /* filter for port availability */ | 130 | #define TIPC_SUB_PORTS 0x01 /* filter for port availability */ |
131 | #define TIPC_SUB_SERVICE 0x02 /* filter for service availability */ | 131 | #define TIPC_SUB_SERVICE 0x02 /* filter for service availability */ |
132 | #define TIPC_SUB_CANCEL 0x04 /* cancel a subscription */ | ||
132 | #if 0 | 133 | #if 0 |
133 | /* The following filter options are not currently implemented */ | 134 | /* The following filter options are not currently implemented */ |
134 | #define TIPC_SUB_NO_BIND_EVTS 0x04 /* filter out "publish" events */ | 135 | #define TIPC_SUB_NO_BIND_EVTS 0x04 /* filter out "publish" events */ |
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index f13cc0c2b163..aa10a8178e70 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h | |||
@@ -17,14 +17,15 @@ | |||
17 | 17 | ||
18 | struct inet_peer | 18 | struct inet_peer |
19 | { | 19 | { |
20 | /* group together avl_left,avl_right,v4daddr to speedup lookups */ | ||
20 | struct inet_peer *avl_left, *avl_right; | 21 | struct inet_peer *avl_left, *avl_right; |
22 | __be32 v4daddr; /* peer's address */ | ||
23 | __u16 avl_height; | ||
24 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
21 | struct inet_peer *unused_next, **unused_prevp; | 25 | struct inet_peer *unused_next, **unused_prevp; |
22 | __u32 dtime; /* the time of last use of not | 26 | __u32 dtime; /* the time of last use of not |
23 | * referenced entries */ | 27 | * referenced entries */ |
24 | atomic_t refcnt; | 28 | atomic_t refcnt; |
25 | __be32 v4daddr; /* peer's address */ | ||
26 | __u16 avl_height; | ||
27 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
28 | atomic_t rid; /* Frag reception counter */ | 29 | atomic_t rid; /* Frag reception counter */ |
29 | __u32 tcp_ts; | 30 | __u32 tcp_ts; |
30 | unsigned long tcp_ts_stamp; | 31 | unsigned long tcp_ts_stamp; |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 6ca6b71dfe0f..c14b70ed4c57 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -36,13 +36,6 @@ struct route_info { | |||
36 | #define RT6_LOOKUP_F_REACHABLE 0x2 | 36 | #define RT6_LOOKUP_F_REACHABLE 0x2 |
37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 | 37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 |
38 | 38 | ||
39 | struct pol_chain { | ||
40 | int type; | ||
41 | int priority; | ||
42 | struct fib6_node *rules; | ||
43 | struct pol_chain *next; | ||
44 | }; | ||
45 | |||
46 | extern struct rt6_info ip6_null_entry; | 39 | extern struct rt6_info ip6_null_entry; |
47 | 40 | ||
48 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | 41 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 82229146bac7..949b932d2f08 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -21,17 +21,14 @@ | |||
21 | #include <net/fib_rules.h> | 21 | #include <net/fib_rules.h> |
22 | 22 | ||
23 | struct fib_config { | 23 | struct fib_config { |
24 | u8 fc_family; | ||
25 | u8 fc_dst_len; | 24 | u8 fc_dst_len; |
26 | u8 fc_src_len; | ||
27 | u8 fc_tos; | 25 | u8 fc_tos; |
28 | u8 fc_protocol; | 26 | u8 fc_protocol; |
29 | u8 fc_scope; | 27 | u8 fc_scope; |
30 | u8 fc_type; | 28 | u8 fc_type; |
31 | /* 1 byte unused */ | 29 | /* 3 bytes unused */ |
32 | u32 fc_table; | 30 | u32 fc_table; |
33 | __be32 fc_dst; | 31 | __be32 fc_dst; |
34 | __be32 fc_src; | ||
35 | __be32 fc_gw; | 32 | __be32 fc_gw; |
36 | int fc_oif; | 33 | int fc_oif; |
37 | u32 fc_flags; | 34 | u32 fc_flags; |