team: use rcu_dereference_bh() in tx path

Should be used instead of rcu_dereference, since rcu_read_lock_bh is
held.

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

diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index bcc7d6d2579aeb1fe4eb012697d3ae0c3d65c9ff..2fe02a8713ead31568500237f0539cdfa1faec64 100644 (file)
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -40,7 +40,7 @@ static bool ab_transmit(struct team *team, struct sk_buff *skb)
 {
        struct team_port *active_port;
 
-       active_port = rcu_dereference(ab_priv(team)->active_port);
+       active_port = rcu_dereference_bh(ab_priv(team)->active_port);
        if (unlikely(!active_port))
                goto drop;
        skb->dev = active_port->dev;

diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 33e30edeb20280887291ed7e328edd109bf3985b..45cc0951aa48e404636e0673189879377da710bb 100644 (file)
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -124,7 +124,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
                                                struct sk_buff *skb,
                                                unsigned char hash)
 {
-       return rcu_dereference(LB_HTPM_PORT_BY_HASH(lb_priv, hash));
+       return rcu_dereference_bh(LB_HTPM_PORT_BY_HASH(lb_priv, hash));
 }
 
 struct lb_select_tx_port {
@@ -179,7 +179,7 @@ static unsigned int lb_get_skb_hash(struct lb_priv *lb_priv,
        uint32_t lhash;
        unsigned char *c;
 
-       fp = rcu_dereference(lb_priv->fp);
+       fp = rcu_dereference_bh(lb_priv->fp);
        if (unlikely(!fp))
                return 0;
        lhash = SK_RUN_FILTER(fp, skb);
@@ -213,7 +213,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
        unsigned int tx_bytes = skb->len;
 
        hash = lb_get_skb_hash(lb_priv, skb);
-       select_tx_port_func = rcu_dereference(lb_priv->select_tx_port_func);
+       select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
        port = select_tx_port_func(team, lb_priv, skb, hash);
        if (unlikely(!port))
                goto drop;