Skip to content

Commit

Permalink
team: use rcu_dereference_bh() in tx path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jun 19, 2012
1 parent 2fcdb2c commit d1904fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/team/team_mode_activebackup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/team/team_mode_loadbalance.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d1904fb

Please sign in to comment.