diff options
| author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2011-07-05 14:34:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-05 18:39:40 -0700 |
| commit | 5318d809d7b4975ce5e5303e8508f89a5458c2b6 (patch) | |
| tree | 2e676330331419d9bb2e3d17f2f97462df7ce548 /drivers/net/vmxnet3/vmxnet3_int.h | |
| parent | 44661462ee1ee3c922754fc1f246867f0d01e7ea (diff) | |
| download | op-kernel-dev-5318d809d7b4975ce5e5303e8508f89a5458c2b6.zip op-kernel-dev-5318d809d7b4975ce5e5303e8508f89a5458c2b6.tar.gz | |
vmxnet3: fix starving rx ring whenoc_skb kb fails
If the rx ring is completely empty, then the device may never fire an rx
interrupt. Unfortunately, the rx interrupt is what triggers populating the
rx ring with fresh buffers, so this will cause networking to lock up.
This patch replenishes the skb in recv descriptor as soon as it is
peeled off while processing rx completions. If the skb/buffer
allocation fails, existing one is recycled and the packet in hand is
dropped. This way none of the RX desc is ever left empty, thus avoiding
starvation
Signed-off-by: Scott J. Goldman <scottjg@vmware.com>
Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_int.h')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index f50d36f..8db7ecf 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -68,10 +68,10 @@ /* * Version numbers */ -#define VMXNET3_DRIVER_VERSION_STRING "1.1.9.0-k" +#define VMXNET3_DRIVER_VERSION_STRING "1.1.14.0-k" /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ -#define VMXNET3_DRIVER_VERSION_NUM 0x01010900 +#define VMXNET3_DRIVER_VERSION_NUM 0x01010E00 #if defined(CONFIG_PCI_MSI) /* RSS only makes sense if MSI-X is supported. */ |
