diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 15:08:47 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 15:08:47 +0400 |
| commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
| tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /include/net/flow.h | |
| parent | 7b27718bdb1b70166383dec91391df5534d449ee (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
| download | linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz | |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index ad16e0076c89..228b2477ceec 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -47,7 +47,6 @@ struct flowi { #define fl4_scope nl_u.ip4_u.scope __u8 proto; - __u8 flags; union { struct { __be16 sport; |