Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
cls_cgroup: Fix oops when user send improperly 'tc filter add' request
r8169: fix crash when large packets are received
+8
-6
+5
-6
drivers/net/r8169.c
+5
-6
drivers/net/r8169.c
···
66
66
#define RX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
67
67
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
68
68
#define EarlyTxThld 0x3F /* 0x3F means NO early transmit */
69
-
#define RxPacketMaxSize 0x3FE8 /* 16K - 1 - ETH_HLEN - VLAN - CRC... */
70
69
#define SafeMtu 0x1c20 /* ... actually life sucks beyond ~7k */
71
70
#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */
72
71
···
2356
2357
return cmd;
2357
2358
}
2358
2359
2359
-
static void rtl_set_rx_max_size(void __iomem *ioaddr)
2360
+
static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)
2360
2361
{
2361
2362
/* Low hurts. Let's disable the filtering. */
2362
-
RTL_W16(RxMaxSize, 16383);
2363
+
RTL_W16(RxMaxSize, rx_buf_sz);
2363
2364
}
2364
2365
2365
2366
static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
···
2406
2407
2407
2408
RTL_W8(EarlyTxThres, EarlyTxThld);
2408
2409
2409
-
rtl_set_rx_max_size(ioaddr);
2410
+
rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);
2410
2411
2411
2412
if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||
2412
2413
(tp->mac_version == RTL_GIGA_MAC_VER_02) ||
···
2667
2668
2668
2669
RTL_W8(EarlyTxThres, EarlyTxThld);
2669
2670
2670
-
rtl_set_rx_max_size(ioaddr);
2671
+
rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);
2671
2672
2672
2673
tp->cp_cmd |= RTL_R16(CPlusCmd) | PktCntrDisable | INTT_1;
2673
2674
···
2845
2846
2846
2847
RTL_W8(EarlyTxThres, EarlyTxThld);
2847
2848
2848
-
rtl_set_rx_max_size(ioaddr);
2849
+
rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);
2849
2850
2850
2851
tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
2851
2852