Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 18.11-rc3
[deb_dpdk.git]
/
drivers
/
net
/
cxgbe
/
cxgbe_filter.c
diff --git
a/drivers/net/cxgbe/cxgbe_filter.c
b/drivers/net/cxgbe/cxgbe_filter.c
index
ef1102b
..
3a7912e
100644
(file)
--- a/
drivers/net/cxgbe/cxgbe_filter.c
+++ b/
drivers/net/cxgbe/cxgbe_filter.c
@@
-263,8
+263,8
@@
static u64 hash_filter_ntuple(const struct filter_entry *f)
u64 ntuple = 0;
u16 tcp_proto = IPPROTO_TCP; /* TCP Protocol Number */
u64 ntuple = 0;
u16 tcp_proto = IPPROTO_TCP; /* TCP Protocol Number */
- if (tp->port_shift >= 0)
- ntuple |= (u64)f->fs.
mask
.iport << tp->port_shift;
+ if (tp->port_shift >= 0
&& f->fs.mask.iport
)
+ ntuple |= (u64)f->fs.
val
.iport << tp->port_shift;
if (tp->protocol_shift >= 0) {
if (!f->fs.val.proto)
if (tp->protocol_shift >= 0) {
if (!f->fs.val.proto)
@@
-278,9
+278,6
@@
static u64 hash_filter_ntuple(const struct filter_entry *f)
if (tp->macmatch_shift >= 0 && f->fs.mask.macidx)
ntuple |= (u64)(f->fs.val.macidx) << tp->macmatch_shift;
if (tp->macmatch_shift >= 0 && f->fs.mask.macidx)
ntuple |= (u64)(f->fs.val.macidx) << tp->macmatch_shift;
- if (ntuple != tp->hash_filter_mask)
- return 0;
-
return ntuple;
}
return ntuple;
}