myri10ge: allow LRO to be enabled via ethtool
Subsystems (2)
PATCH 1/2 myri10ge: allow LRO to be enabled via ethtool
Allow myri10ge LRO to be enabled/disabled via ethtool (and by the stack for packet forwarding).
drivers/net/myri10ge/myri10ge.c +13 -4
@@ -1300,7 +1300,7 @@ remainder -=MYRI10GE_ALLOC_SIZE ; } -if (mgp->csum_flag && myri10ge_lro) { +if (dev->features &NETIF_F_LRO ) { rx_frags[0 ].page_offset +=MXGEFW_PAD ; rx_frags[0 ].size -=MXGEFW_PAD ; len -=MXGEFW_PAD ;
@@ -1716,12 +1716,17 @@static int myri10ge_set_rx_csum (struct net_device *netdev,u32 csum_enabled) {struct myri10ge_priv *mgp =netdev_priv (netdev); +int err =0 ;if (csum_enabled) mgp->csum_flag =MXGEFW_FLAGS_CKSUM ; -else +else { +u32 flags =ethtool_op_get_flags (netdev); + err =ethtool_op_set_flags (netdev, (flags & ~ETH_FLAG_LRO )); mgp->csum_flag =0 ; -return 0 ; + + } +return err; }static int myri10ge_set_tso (struct net_device *netdev,u32 tso_enabled)
@@ -1904,7 +1909,9 @@ .get_sset_count = myri10ge_get_sset_count, .get_ethtool_stats = myri10ge_get_ethtool_stats, .set_msglevel = myri10ge_set_msglevel, - .get_msglevel = myri10ge_get_msglevel + .get_msglevel = myri10ge_get_msglevel, + .get_flags = ethtool_op_get_flags, + .set_flags = ethtool_op_set_flags };static int myri10ge_allocate_rings (struct myri10ge_slice_state *ss)
@@ -3910,6 +3917,8 @@if (dac_enabled) netdev->features |=NETIF_F_HIGHDMA ; +if (myri10ge_lro) + netdev->features |=NETIF_F_LRO ;/* make sure we can get an irq, and that MSI can be * setup (if available). Also ensure netdev->irq
David Miller
maintainerFrom: Brice Goglin <[email protected]>
Date: Tue, 19 May 2009 22:15:32 +0200
Quoted 4 lines
Allow myri10ge LRO to be enabled/disabled via ethtool (and by the stack for packet forwarding).
Signed-off-by Brice Goglin <[email protected]>
Please also get rid of the module option. It being there sets a bad precedent, and others are going to point at your driver when they try to add such a turd to their's.
Thanks.
David Miller
maintainerFrom: Brice Goglin <[email protected]>
Date: Tue, 19 May 2009 22:15:32 +0200
Quoted 4 lines
Allow myri10ge LRO to be enabled/disabled via ethtool (and by the stack for packet forwarding).
Signed-off-by Brice Goglin <[email protected]>
So I applied these two patches for now to net-next-2.6 but in the long term I think it's probably better to convert this driver to GRO as we're trying to get rid of LRO and GRO handles forwarding and all of that stuff transparently.
And I also still want the myri10ge_lro module option removed regardless of whether you do a GRO conversion or not.
If LRO/GRO causes a performance regression in some situation, we should fix it instead of papering over this junk with module options.
Thanks.