diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-02-17 23:43:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-27 16:11:51 -0800 |
| commit | 080e4130b1fb6a02e75149a1cccc8192e734713d (patch) | |
| tree | 09627d9d6e7811fc4ae119df03b892327efbd0dc /net/core | |
| parent | 8a8efa22f51b3c3f879d272914e3dbbc2041bf91 (diff) | |
| download | linux-3.10-080e4130b1fb6a02e75149a1cccc8192e734713d.tar.gz linux-3.10-080e4130b1fb6a02e75149a1cccc8192e734713d.tar.bz2 linux-3.10-080e4130b1fb6a02e75149a1cccc8192e734713d.zip | |
netpoll: remove IFF_IN_NETPOLL flag
V4: rebase to net-next-2.6
This patch removes the flag IFF_IN_NETPOLL, we don't need it any more since
we have netpoll_tx_running() now.
Signed-off-by: WANG Cong <amwang@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 02dc2cbcbe8..f68e6949294 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -313,9 +313,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, tries > 0; --tries) { if (__netif_tx_trylock(txq)) { if (!netif_tx_queue_stopped(txq)) { - dev->priv_flags |= IFF_IN_NETPOLL; status = ops->ndo_start_xmit(skb, dev); - dev->priv_flags &= ~IFF_IN_NETPOLL; if (status == NETDEV_TX_OK) txq_trans_update(txq); } |