Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2010-03-29 11:58:05 +0200
committerJan Beulich <jbeulich@novell.com>2010-03-29 11:58:05 +0200
commitfbf9c5540ab10cc046172a8dc89d207c2ae4db10 (patch)
treea8d6bbd88ccfae20c2d7ba3aefb4a2d39a140af0
parentbdbc8cb998c50538bb43c36d0e398af6ac42b9a3 (diff)
- patches.xen/xen-netfront-ethtool: netfront: ethtool -i doesrpm-2.6.32.10-0.4
not return info about xennet driver (bnc#591179).
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.xen/xen-netfront-ethtool31
-rw-r--r--series.conf1
3 files changed, 38 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index cf9815d156..f36b69a412 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 29 11:57:44 CEST 2010 - jbeulich@novell.com
+
+- patches.xen/xen-netfront-ethtool: netfront: ethtool -i does
+ not return info about xennet driver (bnc#591179).
+
+-------------------------------------------------------------------
Mon Mar 29 10:15:31 CEST 2010 - trenn@suse.de
- patches.arch/ppc-unmap_vmallocs_on_hotremove.patch:
diff --git a/patches.xen/xen-netfront-ethtool b/patches.xen/xen-netfront-ethtool
new file mode 100644
index 0000000000..1eddafe6d3
--- /dev/null
+++ b/patches.xen/xen-netfront-ethtool
@@ -0,0 +1,31 @@
+From: ksrinivasan@novell.com
+Subject: netfront: ethtool -i does not return info about xennet driver
+Patch-mainline: n/a
+References: bnc#591179
+
+Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
+
+--- sle11sp1-2010-03-29.orig/drivers/xen/netfront/netfront.c 2009-11-06 10:52:23.000000000 +0100
++++ sle11sp1-2010-03-29/drivers/xen/netfront/netfront.c 2010-03-27 00:18:30.000000000 +0100
+@@ -1766,6 +1766,13 @@ static void xennet_set_features(struct n
+ xennet_set_tso(dev, 1);
+ }
+
++static void netfront_get_drvinfo(struct net_device *dev,
++ struct ethtool_drvinfo *info)
++{
++ strcpy(info->driver, "netfront");
++ strcpy(info->bus_info, dev_name(dev->dev.parent));
++}
++
+ static int network_connect(struct net_device *dev)
+ {
+ struct netfront_info *np = netdev_priv(dev);
+@@ -1874,6 +1881,7 @@ static void netif_uninit(struct net_devi
+
+ static const struct ethtool_ops network_ethtool_ops =
+ {
++ .get_drvinfo = netfront_get_drvinfo,
+ .get_tx_csum = ethtool_op_get_tx_csum,
+ .set_tx_csum = ethtool_op_set_tx_csum,
+ .get_sg = ethtool_op_get_sg,
diff --git a/series.conf b/series.conf
index 838d2f84f7..44cf5242a2 100644
--- a/series.conf
+++ b/series.conf
@@ -1848,6 +1848,7 @@
patches.xen/xen-netback-generalize
patches.xen/xen-netback-multiple-tasklets
patches.xen/xen-netback-kernel-threads
+ patches.xen/xen-netfront-ethtool
patches.xen/xen-unpriv-build
patches.xen/xen-vusb-module-alias
patches.xen/xen-vscsi-module-alias