diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-11-19 19:24:52 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:54:18 -0800 |
| commit | 33f807ba0d9259e7c75c7a2ce8bd2787e5b540c7 (patch) | |
| tree | 3ffeae5c29c5aa36605dfe7a00dc0f4f95ef9177 | |
| parent | 0953864160bdd28dfe45fd46fa462b4d2d53cb96 (diff) | |
| download | linux-3.10-33f807ba0d9259e7c75c7a2ce8bd2787e5b540c7.tar.gz linux-3.10-33f807ba0d9259e7c75c7a2ce8bd2787e5b540c7.tar.bz2 linux-3.10-33f807ba0d9259e7c75c7a2ce8bd2787e5b540c7.zip | |
[NETPOLL]: Kill NETPOLL_RX_DROP, set but never tested.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/netpoll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index cf6acd3084a..9e3aea0bd36 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -40,7 +40,6 @@ static atomic_t trapped; #define USEC_PER_POLL 50 #define NETPOLL_RX_ENABLED 1 -#define NETPOLL_RX_DROP 2 #define MAX_SKB_SIZE \ (MAX_UDP_CHUNK + sizeof(struct udphdr) + \ @@ -128,13 +127,11 @@ static int poll_one_napi(struct netpoll_info *npinfo, if (!test_bit(NAPI_STATE_SCHED, &napi->state)) return budget; - npinfo->rx_flags |= NETPOLL_RX_DROP; atomic_inc(&trapped); work = napi->poll(napi, budget); atomic_dec(&trapped); - npinfo->rx_flags &= ~NETPOLL_RX_DROP; return budget - work; } @@ -475,7 +472,7 @@ int __netpoll_rx(struct sk_buff *skb) if (skb->dev->type != ARPHRD_ETHER) goto out; - /* check if netpoll clients need ARP */ + /* if receive ARP during middle of NAPI poll, then queue */ if (skb->protocol == htons(ETH_P_ARP) && atomic_read(&trapped)) { skb_queue_tail(&npi->arp_tx, skb); @@ -537,6 +534,9 @@ int __netpoll_rx(struct sk_buff *skb) return 1; out: + /* If packet received while already in poll then just + * silently drop. + */ if (atomic_read(&trapped)) { kfree_skb(skb); return 1; |