diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/net/flow.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
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 */ |