diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /net/core | |
| parent | 9a4a84294b0d60b8c287131478f743ba2bc68949 (diff) | |
| parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 96fb0519eb7a..755414cd49d1 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -134,9 +134,11 @@ static int poll_one_napi(struct netpoll_info *npinfo, | |||
| 134 | 134 | ||
| 135 | npinfo->rx_flags |= NETPOLL_RX_DROP; | 135 | npinfo->rx_flags |= NETPOLL_RX_DROP; |
| 136 | atomic_inc(&trapped); | 136 | atomic_inc(&trapped); |
| 137 | set_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 137 | 138 | ||
| 138 | work = napi->poll(napi, budget); | 139 | work = napi->poll(napi, budget); |
| 139 | 140 | ||
| 141 | clear_bit(NAPI_STATE_NPSVC, &napi->state); | ||
| 140 | atomic_dec(&trapped); | 142 | atomic_dec(&trapped); |
| 141 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; | 143 | npinfo->rx_flags &= ~NETPOLL_RX_DROP; |
| 142 | 144 | ||