diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-03-22 02:38:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-23 12:45:10 -0700 |
| commit | 35d48903e9781975e823b359ee85c257c9ff5c1c (patch) | |
| tree | 889a517bd0ccfbf64978ca9f8b5e70225a268d87 /drivers/net/bonding/bonding.h | |
| parent | cda6587c21a887254c8ed4b58da8fcc4040ab557 (diff) | |
| download | talos-op-linux-35d48903e9781975e823b359ee85c257c9ff5c1c.tar.gz talos-op-linux-35d48903e9781975e823b359ee85c257c9ff5c1c.zip | |
bonding: fix rx_handler locking
This prevents possible race between bond_enslave and bond_handle_frame
as reported by Nicolas by moving rx_handler register/unregister.
slave->bond is added to hold pointer to master bonding sructure. That
way dev->master is no longer used in bond_handler_frame.
Also, this removes "BUG: scheduling while atomic" message
Reported-by: Nicolas de Pesloüan <nicolas.2p.debian@gmail.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Tested-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 6b26962fd0ec..90736cb4d975 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -187,6 +187,7 @@ struct slave { struct net_device *dev; /* first - useful for panic debug */ struct slave *next; struct slave *prev; + struct bonding *bond; /* our master */ int delay; unsigned long jiffies; unsigned long last_arp_rx; |
