diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2015-05-12 14:56:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-13 15:19:47 -0400 |
| commit | 59346afe7a5548ab3e9730aeff33993faa76abbe (patch) | |
| tree | 6329cc2967ff9acc3f93d8f8df7b54d05b2e5e72 /net/core | |
| parent | 67a900cc0436d74e7ff89042371760def087680d (diff) | |
| download | blackbird-op-linux-59346afe7a5548ab3e9730aeff33993faa76abbe.tar.gz blackbird-op-linux-59346afe7a5548ab3e9730aeff33993faa76abbe.zip | |
flow_dissector: change port array into src, dst tuple
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow_dissector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 7a0b391114a5..204d09c42510 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -385,9 +385,9 @@ static inline u32 __flow_hash_from_keys(struct flow_keys *keys, u32 keyval) /* get a consistent hash (same value on both flow directions) */ if (((__force u32)keys->addrs.dst < (__force u32)keys->addrs.src) || (((__force u32)keys->addrs.dst == (__force u32)keys->addrs.src) && - ((__force u16)keys->ports.port16[1] < (__force u16)keys->ports.port16[0]))) { + ((__force u16)keys->ports.dst < (__force u16)keys->ports.src))) { swap(keys->addrs.dst, keys->addrs.src); - swap(keys->ports.port16[0], keys->ports.port16[1]); + swap(keys->ports.src, keys->ports.dst); } hash = __flow_hash_3words((__force u32)keys->addrs.dst, |
