diff --git a/[refs] b/[refs] index 5cf51c70e8ac..2749ad038d02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5b9f4c083b0e3102f3101545279f623680cb3a0 +refs/heads/master: 47552c4e555eefe381f3d45140b59a2ea4b16486 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 3f269e4e9438..33ce7ed6afc6 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -589,7 +589,7 @@ static int ethtool_set_tso(struct net_device *dev, char __user *useraddr) static int ethtool_get_ufo(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GTSO }; + struct ethtool_value edata = { ETHTOOL_GUFO }; if (!dev->ethtool_ops->get_ufo) return -EOPNOTSUPP; @@ -598,6 +598,7 @@ static int ethtool_get_ufo(struct net_device *dev, char __user *useraddr) return -EFAULT; return 0; } + static int ethtool_set_ufo(struct net_device *dev, char __user *useraddr) { struct ethtool_value edata;