diff options
| author | Nithin Sujir <nsujir@broadcom.com> | 2014-02-06 14:13:05 -0800 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-05-20 16:35:08 +0200 |
| commit | d9511feaeef616ba2bac2917352cc33a4dac0339 (patch) | |
| tree | 1fa2d10ea85aa050d738a412c39d84e9125774ab | |
| parent | a6fd7daffa6f195c8a70b299ca4eb3a415c2d241 (diff) | |
| download | linux-2.6.32.y-drm33.z-d9511feaeef616ba2bac2917352cc33a4dac0339.tar.gz | |
tg3: Fix deadlock in tg3_change_mtu()
[ Upstream commit c6993dfd7db9b0c6b7ca7503a56fda9236a4710f ]
Quoting David Vrabel -
"5780 cards cannot have jumbo frames and TSO enabled together. When
jumbo frames are enabled by setting the MTU, the TSO feature must be
cleared. This is done indirectly by calling netdev_update_features()
which will call tg3_fix_features() to actually clear the flags.
netdev_update_features() will also trigger a new netlink message for the
feature change event which will result in a call to tg3_get_stats64()
which deadlocks on the tg3 lock."
tg3_set_mtu() does not need to be under the tg3 lock since converting
the flags to use set_bit(). Move it out to after tg3_netif_stop().
Reported-by: David Vrabel <david.vrabel@citrix.com>
Tested-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 89aa69c96d6a5..56648b455a115 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5583,12 +5583,12 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu) tg3_netif_stop(tp); + tg3_set_mtu(dev, tp, new_mtu); + tg3_full_lock(tp, 1); tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); - tg3_set_mtu(dev, tp, new_mtu); - err = tg3_restart_hw(tp, 0); if (!err) |