Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263946
b: refs/heads/master
c: 728871b
h: refs/heads/master
v: v3
  • Loading branch information
David Ward authored and David S. Miller committed Sep 16, 2011
1 parent 42896f2 commit 3334df2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 19c1ea14c930db5e9c0cd7c3c6f4d01457dfcd69
refs/heads/master: 728871bc05afc8ff310b17dba3e57a2472792b13
6 changes: 3 additions & 3 deletions trunk/include/net/flow.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct flowi4 {
#define fl4_ipsec_spi uli.spi
#define fl4_mh_type uli.mht.type
#define fl4_gre_key uli.gre_key
};
} __attribute__((__aligned__(BITS_PER_LONG/8)));

static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
__u32 mark, __u8 tos, __u8 scope,
Expand Down Expand Up @@ -112,7 +112,7 @@ struct flowi6 {
#define fl6_ipsec_spi uli.spi
#define fl6_mh_type uli.mht.type
#define fl6_gre_key uli.gre_key
};
} __attribute__((__aligned__(BITS_PER_LONG/8)));

struct flowidn {
struct flowi_common __fl_common;
Expand All @@ -127,7 +127,7 @@ struct flowidn {
union flowi_uli uli;
#define fld_sport uli.ports.sport
#define fld_dport uli.ports.dport
};
} __attribute__((__aligned__(BITS_PER_LONG/8)));

struct flowi {
union {
Expand Down

0 comments on commit 3334df2

Please sign in to comment.