Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] e1000:Adjust flow control watermarks for Jumbo Frames
Adjust flow control watermarks for Jumbo Frames
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
authored by Malli Chilakala and committed by Jeff Garzik 1125ecbc 0e6ef3e0
+15
-2
drivers/net/e1000/e1000_main.c
+15
-2
drivers/net/e1000/e1000_main.c
···
409
void
410
e1000_reset(struct e1000_adapter *adapter)
411
{
412
uint32_t pba, manc;
413
414
/* Repartition Pba for greater than 9k mtu
415
* To take effect CTRL.RST is required.
···
431
break;
432
}
433
434
435
436
if(adapter->hw.mac_type == e1000_82547) {
···
455
456
/* flow control settings */
457
adapter->hw.fc_high_water = (pba << E1000_PBA_BYTES_SHIFT) -
458
-
E1000_FC_HIGH_DIFF;
459
adapter->hw.fc_low_water = (pba << E1000_PBA_BYTES_SHIFT) -
460
-
E1000_FC_LOW_DIFF;
461
adapter->hw.fc_pause_time = E1000_FC_PAUSE_TIME;
462
adapter->hw.fc_send_xon = 1;
463
adapter->hw.fc = adapter->hw.original_fc;
···
409
void
410
e1000_reset(struct e1000_adapter *adapter)
411
{
412
+
struct net_device *netdev = adapter->netdev;
413
uint32_t pba, manc;
414
+
uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;
415
+
uint16_t fc_low_water_mark = E1000_FC_LOW_DIFF;
416
417
/* Repartition Pba for greater than 9k mtu
418
* To take effect CTRL.RST is required.
···
428
break;
429
}
430
431
+
if((adapter->hw.mac_type != e1000_82573) &&
432
+
(adapter->rx_buffer_len > E1000_RXBUFFER_8192)) {
433
+
pba -= 8; /* allocate more FIFO for Tx */
434
+
/* send an XOFF when there is enough space in the
435
+
* Rx FIFO to hold one extra full size Rx packet
436
+
*/
437
+
fc_high_water_mark = netdev->mtu + ENET_HEADER_SIZE +
438
+
ETHERNET_FCS_SIZE + 1;
439
+
fc_low_water_mark = fc_high_water_mark + 8;
440
+
}
441
442
443
if(adapter->hw.mac_type == e1000_82547) {
···
442
443
/* flow control settings */
444
adapter->hw.fc_high_water = (pba << E1000_PBA_BYTES_SHIFT) -
445
+
fc_high_water_mark;
446
adapter->hw.fc_low_water = (pba << E1000_PBA_BYTES_SHIFT) -
447
+
fc_low_water_mark;
448
adapter->hw.fc_pause_time = E1000_FC_PAUSE_TIME;
449
adapter->hw.fc_send_xon = 1;
450
adapter->hw.fc = adapter->hw.original_fc;