diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /drivers/net/r8169.c | |
| parent | 000ba2e43f33901859fd794bb33c885909d53b3b (diff) | |
| parent | 887e671f324d9898aaedb29a6ece6c853c394067 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 1f7946c7d4e..1b0aa4cf89b 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3379,7 +3379,7 @@ static u16 rtl_rw_cpluscmd(void __iomem *ioaddr) static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz) { /* Low hurts. Let's disable the filtering. */ - RTL_W16(RxMaxSize, rx_buf_sz); + RTL_W16(RxMaxSize, rx_buf_sz + 1); } static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version) |