diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2012-06-19 05:54:06 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-19 15:00:23 -0700 |
| commit | 596e2024c42159fedf71b3d17fba78eed9b5bf10 (patch) | |
| tree | 081d68ebece7f30600a8119d87ed8448a1968856 | |
| parent | team: add mode priv to port (diff) | |
| download | linux-dev-596e2024c42159fedf71b3d17fba78eed9b5bf10.tar.xz linux-dev-596e2024c42159fedf71b3d17fba78eed9b5bf10.zip | |
team: lb: push hash counting into separate function
Also squash hash into one byte
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/team/team_mode_loadbalance.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c index 6452428a1d6c..a475b1304f9a 100644 --- a/drivers/net/team/team_mode_loadbalance.c +++ b/drivers/net/team/team_mode_loadbalance.c @@ -27,18 +27,27 @@ static struct lb_priv *lb_priv(struct team *team) return (struct lb_priv *) &team->mode_priv; } -static bool lb_transmit(struct team *team, struct sk_buff *skb) +static unsigned char lb_get_skb_hash(struct lb_priv *lb_priv, + struct sk_buff *skb) { struct sk_filter *fp; + uint32_t lhash; + unsigned char *c; + + fp = rcu_dereference(lb_priv->fp); + if (unlikely(!fp)) + return 0; + lhash = SK_RUN_FILTER(fp, skb); + c = (char *) &lhash; + return c[0] ^ c[1] ^ c[2] ^ c[3]; +} + +static bool lb_transmit(struct team *team, struct sk_buff *skb) +{ struct team_port *port; - unsigned int hash; int port_index; - fp = rcu_dereference(lb_priv(team)->fp); - if (unlikely(!fp)) - goto drop; - hash = SK_RUN_FILTER(fp, skb); - port_index = hash % team->en_port_count; + port_index = lb_get_skb_hash(lb_priv(team), skb) % team->en_port_count; port = team_get_port_by_index_rcu(team, port_index); if (unlikely(!port)) goto drop; |