projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[powerpc.git]
/
include
/
net
/
flow.h
diff --git
a/include/net/flow.h
b/include/net/flow.h
index
3ca210e
..
f3cc1f8
100644
(file)
--- a/
include/net/flow.h
+++ b/
include/net/flow.h
@@
-13,12
+13,12
@@
struct flowi {
int oif;
int iif;
struct flowi {
int oif;
int iif;
+ __u32 mark;
union {
struct {
union {
struct {
- __u32 daddr;
- __u32 saddr;
- __u32 fwmark;
+ __be32 daddr;
+ __be32 saddr;
__u8 tos;
__u8 scope;
} ip4_u;
__u8 tos;
__u8 scope;
} ip4_u;
@@
-26,28
+26,23
@@
struct flowi {
struct {
struct in6_addr daddr;
struct in6_addr saddr;
struct {
struct in6_addr daddr;
struct in6_addr saddr;
- __u32 fwmark;
- __u32 flowlabel;
+ __be32 flowlabel;
} ip6_u;
struct {
__le16 daddr;
__le16 saddr;
} ip6_u;
struct {
__le16 daddr;
__le16 saddr;
- __u32 fwmark;
__u8 scope;
} dn_u;
} nl_u;
#define fld_dst nl_u.dn_u.daddr
#define fld_src nl_u.dn_u.saddr
__u8 scope;
} dn_u;
} nl_u;
#define fld_dst nl_u.dn_u.daddr
#define fld_src nl_u.dn_u.saddr
-#define fld_fwmark nl_u.dn_u.fwmark
#define fld_scope nl_u.dn_u.scope
#define fl6_dst nl_u.ip6_u.daddr
#define fl6_src nl_u.ip6_u.saddr
#define fld_scope nl_u.dn_u.scope
#define fl6_dst nl_u.ip6_u.daddr
#define fl6_src nl_u.ip6_u.saddr
-#define fl6_fwmark nl_u.ip6_u.fwmark
#define fl6_flowlabel nl_u.ip6_u.flowlabel
#define fl4_dst nl_u.ip4_u.daddr
#define fl4_src nl_u.ip4_u.saddr
#define fl6_flowlabel nl_u.ip6_u.flowlabel
#define fl4_dst nl_u.ip4_u.daddr
#define fl4_src nl_u.ip4_u.saddr
-#define fl4_fwmark nl_u.ip4_u.fwmark
#define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope
#define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope
@@
-56,8
+51,8
@@
struct flowi {
#define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
union {
struct {
#define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
union {
struct {
- __
u16
sport;
- __
u16
dport;
+ __
be16
sport;
+ __
be16
dport;
} ports;
struct {
} ports;
struct {
@@
-68,12
+63,9
@@
struct flowi {
struct {
__le16 sport;
__le16 dport;
struct {
__le16 sport;
__le16 dport;
- __u8 objnum;
- __u8 objnamel; /* Not 16 bits since max val is 16 */
- __u8 objname[16]; /* Not zero terminated */
} dnports;
} dnports;
- __
u32
spi;
+ __
be32
spi;
#ifdef CONFIG_IPV6_MIP6
struct {
#ifdef CONFIG_IPV6_MIP6
struct {
@@
-97,7
+89,7
@@
struct flowi {
#define FLOW_DIR_FWD 2
struct sock;
#define FLOW_DIR_FWD 2
struct sock;
-typedef
void
(*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
+typedef
int
(*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
void **objp, atomic_t **obj_refp);
extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
void **objp, atomic_t **obj_refp);
extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
@@
-105,4
+97,10
@@
extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
extern void flow_cache_flush(void);
extern atomic_t flow_cache_genid;
extern void flow_cache_flush(void);
extern atomic_t flow_cache_genid;
+static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
+{
+ return (fl1->proto == fl2->proto &&
+ !memcmp(&fl1->uli_u, &fl2->uli_u, sizeof(fl1->uli_u)));
+}
+
#endif
#endif