team: lb: push hash counting into separate function
authorJiri Pirko <jpirko@redhat.com>
Tue, 19 Jun 2012 05:54:06 +0000 (05:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Jun 2012 22:00:23 +0000 (15:00 -0700)
Also squash hash into one byte

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/team/team_mode_loadbalance.c

index 6452428a1d6c0b0d065fa9a05cccfda8a77d1ce6..a475b1304f9adf32e0cc5b744a6d992e8657706d 100644 (file)
@@ -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;