From 254050c05cc83d7af5a4d10f6d3c20706289e6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
Date: Sun, 22 Jan 2012 00:20:40 +0000
Subject: [PATCH] --- yaml --- r: 286697 b: refs/heads/master c:
 f80400a26a2e8bff541de12834a1134358bb6642 h: refs/heads/master i:   286695:
 aa77eb0818e37a7e201c59c5080159c731b19558 v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/ethtool.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f3353fd7558..325e3838cb6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1cc16b8e643096adb92bbcb76c6c4c564141c40
+refs/heads/master: f80400a26a2e8bff541de12834a1134358bb6642
diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c
index 921aa2b4b415..369b41894527 100644
--- a/trunk/net/core/ethtool.c
+++ b/trunk/net/core/ethtool.c
@@ -1311,6 +1311,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
 	case ETHTOOL_GRXCSUM:
 	case ETHTOOL_GTXCSUM:
 	case ETHTOOL_GSG:
+	case ETHTOOL_GSSET_INFO:
 	case ETHTOOL_GSTRINGS:
 	case ETHTOOL_GTSO:
 	case ETHTOOL_GPERMADDR: