Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[RRUNNER]: Do not muck with sysctl_{r,w}mem_max

Drivers have no business changing these values.

Signed-off-by: David S. Miller <davem@davemloft.net>

-18
-18
drivers/net/rrunner.c
··· 78 78 * stack will need to know about I/O vectors or something similar. 79 79 */ 80 80 81 - /* 82 - * sysctl_[wr]mem_max are checked at init time to see if they are at 83 - * least 256KB and increased to 256KB if they are not. This is done to 84 - * avoid ending up with socket buffers smaller than the MTU size, 85 - */ 86 - 87 81 static int __devinit rr_init_one(struct pci_dev *pdev, 88 82 const struct pci_device_id *ent) 89 83 { ··· 554 560 555 561 sram_size = rr_read_eeprom_word(rrpriv, (void *)8); 556 562 printk(" SRAM size 0x%06x\n", sram_size); 557 - 558 - if (sysctl_rmem_max < 262144){ 559 - printk(" Receive socket buffer limit too low (%i), " 560 - "setting to 262144\n", sysctl_rmem_max); 561 - sysctl_rmem_max = 262144; 562 - } 563 - 564 - if (sysctl_wmem_max < 262144){ 565 - printk(" Transmit socket buffer limit too low (%i), " 566 - "setting to 262144\n", sysctl_wmem_max); 567 - sysctl_wmem_max = 262144; 568 - } 569 563 570 564 return 0; 571 565 }