diff options
author | Davide Ciminaghi <ciminaghi@gnudd.com> | 2012-04-13 04:48:25 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-14 15:21:27 -0400 |
commit | 8a9a0ea6032186e3030419262678d652b88bf6a8 (patch) | |
tree | db5ab740913595d6b89c7a8974a1743dffc98930 /drivers/net/ethernet | |
parent | c509e754af96882eb46130e215cc4aa8f763d4ac (diff) | |
download | linux-3.10-8a9a0ea6032186e3030419262678d652b88bf6a8.tar.gz linux-3.10-8a9a0ea6032186e3030419262678d652b88bf6a8.tar.bz2 linux-3.10-8a9a0ea6032186e3030419262678d652b88bf6a8.zip |
net/ethernet: ks8851_mll fix rx frame buffer overflow
At the beginning of ks_rcv(), a for loop retrieves the
header information relevant to all the frames stored
in the mac's internal buffers. The number of pending
frames is stored as an 8 bits field in KS_RXFCTR.
If interrupts are disabled long enough to allow for more than
32 frames to accumulate in the MAC's internal buffers, a buffer
overflow occurs.
This patch fixes the problem by making the
driver's frame_head_info buffer big enough.
Well actually, since the chip appears to have 12K of
internal rx buffers and the shortest ethernet frame should
be 64 bytes long, maybe the limit could be set to
12*1024/64 = 192 frames, but 255 should be safer.
Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com>
Signed-off-by: Raffaele Recalcati <raffaele.recalcati@bticino.it>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index b8104d9f408..5ffde23ac8f 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c @@ -40,7 +40,7 @@ #define DRV_NAME "ks8851_mll" static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 }; -#define MAX_RECV_FRAMES 32 +#define MAX_RECV_FRAMES 255 #define MAX_BUF_SIZE 2048 #define TX_BUF_SIZE 2000 #define RX_BUF_SIZE 2000 |