Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1904fbd authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fcdb2c9

drivers/net/team/team_mode_activebackup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/team/team_mode_loadbalance.c

+3 −3
Original line number Diff line number Diff line
@@ -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;