mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: ipv6: Fix inet6_csk_bind_conflict() e100: Fix the TX workqueue race
This commit is contained in:
commit
b91ce4d14a
2 changed files with 9 additions and 3 deletions
|
@ -166,6 +166,7 @@
|
||||||
#include <linux/ethtool.h>
|
#include <linux/ethtool.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/firmware.h>
|
#include <linux/firmware.h>
|
||||||
|
#include <linux/rtnetlink.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
|
|
||||||
|
@ -2265,8 +2266,13 @@ static void e100_tx_timeout_task(struct work_struct *work)
|
||||||
|
|
||||||
DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
|
DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
|
||||||
ioread8(&nic->csr->scb.status));
|
ioread8(&nic->csr->scb.status));
|
||||||
e100_down(netdev_priv(netdev));
|
|
||||||
e100_up(netdev_priv(netdev));
|
rtnl_lock();
|
||||||
|
if (netif_running(netdev)) {
|
||||||
|
e100_down(netdev_priv(netdev));
|
||||||
|
e100_up(netdev_priv(netdev));
|
||||||
|
}
|
||||||
|
rtnl_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
|
static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
|
||||||
|
|
|
@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
|
||||||
ipv6_rcv_saddr_equal(sk, sk2))
|
ipv6_rcv_saddr_equal(sk, sk2))
|
||||||
break;
|
break;
|
||||||
else if (sk->sk_reuse && sk2->sk_reuse &&
|
else if (sk->sk_reuse && sk2->sk_reuse &&
|
||||||
!ipv6_addr_any(inet6_rcv_saddr(sk2)) &&
|
!ipv6_addr_any(inet6_rcv_saddr(sk)) &&
|
||||||
ipv6_rcv_saddr_equal(sk, sk2))
|
ipv6_rcv_saddr_equal(sk, sk2))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue