diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:31:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:31:48 -0500 |
| commit | 3d1f337b3e7378923c89f37afb573a918ef40be5 (patch) | |
| tree | 386798378567a10d1c7b24f599cb50f70298694c /include/net/flow.h | |
| parent | 2bf2154c6bb5599e3ec3f73c34861a0b12aa839e (diff) | |
| parent | 5e35941d990123f155b02d5663e51a24f816b6f3 (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: (235 commits)
[NETFILTER]: Add H.323 conntrack/NAT helper
[TG3]: Don't mark tg3_test_registers() as returning const.
[IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
[IPV6]: Cleanup of net/ipv6/reassambly.c
[BRIDGE]: Remove duplicate const from is_link_local() argument type.
[DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
[TG3]: make drivers/net/tg3.c:tg3_request_irq() static
[BRIDGE]: use LLC to send STP
[LLC]: llc_mac_hdr_init const arguments
[BRIDGE]: allow show/store of group multicast address
[BRIDGE]: use llc for receiving STP packets
[BRIDGE]: stp timer to jiffies cleanup
[BRIDGE]: forwarding remove unneeded preempt and bh diasables
[BRIDGE]: netfilter inline cleanup
[BRIDGE]: netfilter VLAN macro cleanup
[BRIDGE]: netfilter dont use __constant_htons
[BRIDGE]: netfilter whitespace
[BRIDGE]: optimize frame pass up
[BRIDGE]: use kzalloc
...
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index ec7eb86eb203..04d89f763451 100644 --- a/include/net/flow.h +++ b/include/net/flow.h | |||
| @@ -30,8 +30,8 @@ struct flowi { | |||
| 30 | } ip6_u; | 30 | } ip6_u; |
| 31 | 31 | ||
| 32 | struct { | 32 | struct { |
| 33 | __u16 daddr; | 33 | __le16 daddr; |
| 34 | __u16 saddr; | 34 | __le16 saddr; |
| 35 | __u32 fwmark; | 35 | __u32 fwmark; |
| 36 | __u8 scope; | 36 | __u8 scope; |
| 37 | } dn_u; | 37 | } dn_u; |
| @@ -64,8 +64,8 @@ struct flowi { | |||
| 64 | } icmpt; | 64 | } icmpt; |
| 65 | 65 | ||
| 66 | struct { | 66 | struct { |
| 67 | __u16 sport; | 67 | __le16 sport; |
| 68 | __u16 dport; | 68 | __le16 dport; |
| 69 | __u8 objnum; | 69 | __u8 objnum; |
| 70 | __u8 objnamel; /* Not 16 bits since max val is 16 */ | 70 | __u8 objnamel; /* Not 16 bits since max val is 16 */ |
| 71 | __u8 objname[16]; /* Not zero terminated */ | 71 | __u8 objname[16]; /* Not zero terminated */ |