diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2012-06-19 05:54:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-19 15:00:24 -0700 |
| commit | d1904fbd881e43cde2ec024117efaba83f8d9996 (patch) | |
| tree | 51df81d4f7eafd3d2125fa0c71d0199f76e3f50d /drivers/net/team/team_mode_loadbalance.c | |
| parent | team: allow to send multiple set events in one message (diff) | |
| download | linux-dev-d1904fbd881e43cde2ec024117efaba83f8d9996.tar.xz linux-dev-d1904fbd881e43cde2ec024117efaba83f8d9996.zip | |
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>
Diffstat (limited to 'drivers/net/team/team_mode_loadbalance.c')
| -rw-r--r-- | drivers/net/team/team_mode_loadbalance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c index 33e30edeb202..45cc0951aa48 100644 --- 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; |