]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.drivers/cxgb3-enable-lro-through-ethtool
Move xen patchset to new version's subdir.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / cxgb3-enable-lro-through-ethtool
diff --git a/src/patches/suse-2.6.27.31/patches.drivers/cxgb3-enable-lro-through-ethtool b/src/patches/suse-2.6.27.31/patches.drivers/cxgb3-enable-lro-through-ethtool
new file mode 100644 (file)
index 0000000..353ec0f
--- /dev/null
@@ -0,0 +1,133 @@
+From: Divy Le Ray <divy@chelsio.com>
+Date: Wed, 29 Oct 2008 05:40:32 +0000 (-0700)
+Subject: cxgb3 - enable lro control through ethtool
+Acked-by: Karsten Keil <kkeil@novell.com>
+Reference: bnc#446739
+
+
+cxgb3 - enable lro control through ethtool
+
+Implement ethtool's get_flags and set_flags methods.
+It enables ethtool to control the LRO settings.
+
+Signed-off-by: Divy Le Ray <divy@chelsio.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+---
+
+Index: linux-2.6.27/drivers/net/cxgb3/cxgb3_main.c
+===================================================================
+--- linux-2.6.27.orig/drivers/net/cxgb3/cxgb3_main.c
++++ linux-2.6.27/drivers/net/cxgb3/cxgb3_main.c
+@@ -470,6 +470,36 @@ static void enable_all_napi(struct adapt
+ }
+ /**
++ *    set_qset_lro - Turn a queue set's LRO capability on and off
++ *    @dev: the device the qset is attached to
++ *    @qset_idx: the queue set index
++ *    @val: the LRO switch
++ *
++ *    Sets LRO on or off for a particular queue set.
++ *    the device's features flag is updated to reflect the LRO
++ *    capability when all queues belonging to the device are
++ *    in the same state.
++ */
++static void set_qset_lro(struct net_device *dev, int qset_idx, int val)
++{
++      struct port_info *pi = netdev_priv(dev);
++      struct adapter *adapter = pi->adapter;
++      int i, lro_on = 1;
++
++      adapter->params.sge.qset[qset_idx].lro = !!val;
++      adapter->sge.qs[qset_idx].lro_enabled = !!val;
++
++      /* let ethtool report LRO on only if all queues are LRO enabled */
++      for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; ++i)
++              lro_on &= adapter->params.sge.qset[i].lro;
++
++      if (lro_on)
++              dev->features |= NETIF_F_LRO;
++      else
++              dev->features &= ~NETIF_F_LRO;
++}
++
++/**
+  *    setup_sge_qsets - configure SGE Tx/Rx/response queues
+  *    @adap: the adapter
+  *
+@@ -492,8 +522,7 @@ static int setup_sge_qsets(struct adapte
+               pi->qs = &adap->sge.qs[pi->first_qset];
+               for (j = pi->first_qset; j < pi->first_qset + pi->nqsets;
+                    ++j, ++qset_idx) {
+-                      if (!pi->rx_csum_offload)
+-                              adap->params.sge.qset[qset_idx].lro = 0;
++                      set_qset_lro(dev, qset_idx, pi->rx_csum_offload);
+                       err = t3_sge_alloc_qset(adap, qset_idx, 1,
+                               (adap->flags & USING_MSIX) ? qset_idx + 1 :
+                                                            irq_idx,
+@@ -1637,13 +1666,10 @@ static int set_rx_csum(struct net_device
+       p->rx_csum_offload = data;
+       if (!data) {
+-              struct adapter *adap = p->adapter;
+               int i;
+-              for (i = p->first_qset; i < p->first_qset + p->nqsets; i++) {
+-                      adap->params.sge.qset[i].lro = 0;
+-                      adap->sge.qs[i].lro_enabled = 0;
+-              }
++              for (i = p->first_qset; i < p->first_qset + p->nqsets; i++)
++                      set_qset_lro(dev, i, 0);
+       }
+       return 0;
+ }
+@@ -1798,6 +1824,25 @@ static void get_wol(struct net_device *d
+       memset(&wol->sopass, 0, sizeof(wol->sopass));
+ }
++static int cxgb3_set_flags(struct net_device *dev, u32 data)
++{
++      struct port_info *pi = netdev_priv(dev);
++      int i;
++
++      if (data & ETH_FLAG_LRO) {
++              if (!pi->rx_csum_offload)
++                      return -EINVAL;
++
++              for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
++                      set_qset_lro(dev, i, 1);
++
++      } else
++              for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
++                      set_qset_lro(dev, i, 0);
++
++      return 0;
++}
++
+ static const struct ethtool_ops cxgb_ethtool_ops = {
+       .get_settings = get_settings,
+       .set_settings = set_settings,
+@@ -1827,6 +1872,8 @@ static const struct ethtool_ops cxgb_eth
+       .get_regs = get_regs,
+       .get_wol = get_wol,
+       .set_tso = ethtool_op_set_tso,
++      .get_flags = ethtool_op_get_flags,
++      .set_flags = cxgb3_set_flags,
+ };
+ static int in_range(int val, int lo, int hi)
+@@ -1943,11 +1990,9 @@ static int cxgb_extension_ioctl(struct n
+                               }
+                       }
+               }
+-              if (t.lro >= 0) {
+-                      struct sge_qset *qs = &adapter->sge.qs[t.qset_idx];
+-                      q->lro = t.lro;
+-                      qs->lro_enabled = t.lro;
+-              }
++              if (t.lro >= 0)
++                      set_qset_lro(dev, t.qset_idx, t.lro);
++
+               break;
+       }
+       case CHELSIO_GET_QSET_PARAMS:{