提交 3cd8ef4b 编写于 作者: M Michał Mirosław 提交者: David S. Miller

net: niu: convert to hw_features

Side effect: allow toggling of TX offloads.
Signed-off-by: NMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f4786a96
...@@ -7913,11 +7913,6 @@ static int niu_set_phys_id(struct net_device *dev, ...@@ -7913,11 +7913,6 @@ static int niu_set_phys_id(struct net_device *dev,
return 0; return 0;
} }
static int niu_set_flags(struct net_device *dev, u32 data)
{
return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
}
static const struct ethtool_ops niu_ethtool_ops = { static const struct ethtool_ops niu_ethtool_ops = {
.get_drvinfo = niu_get_drvinfo, .get_drvinfo = niu_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
...@@ -7934,8 +7929,6 @@ static const struct ethtool_ops niu_ethtool_ops = { ...@@ -7934,8 +7929,6 @@ static const struct ethtool_ops niu_ethtool_ops = {
.set_phys_id = niu_set_phys_id, .set_phys_id = niu_set_phys_id,
.get_rxnfc = niu_get_nfc, .get_rxnfc = niu_get_nfc,
.set_rxnfc = niu_set_nfc, .set_rxnfc = niu_set_nfc,
.set_flags = niu_set_flags,
.get_flags = ethtool_op_get_flags,
}; };
static int niu_ldg_assign_ldn(struct niu *np, struct niu_parent *parent, static int niu_ldg_assign_ldn(struct niu *np, struct niu_parent *parent,
...@@ -9764,8 +9757,8 @@ static void __devinit niu_device_announce(struct niu *np) ...@@ -9764,8 +9757,8 @@ static void __devinit niu_device_announce(struct niu *np)
static void __devinit niu_set_basic_features(struct net_device *dev) static void __devinit niu_set_basic_features(struct net_device *dev)
{ {
dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM | dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXHASH;
NETIF_F_GRO | NETIF_F_RXHASH); dev->features |= dev->hw_features | NETIF_F_RXCSUM;
} }
static int __devinit niu_pci_init_one(struct pci_dev *pdev, static int __devinit niu_pci_init_one(struct pci_dev *pdev,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册