diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-16 20:15:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-17 20:47:35 -0400 |
commit | 3cd8ef4b6071834fd432bbccbec0611591908643 (patch) | |
tree | 0a8b033788c848d53f02ac504bd714f32f12688c /drivers | |
parent | f4786a96252b97f6f05cd42ea7fe6e967048bfa3 (diff) |
net: niu: convert to hw_features
Side effect: allow toggling of TX offloads.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/niu.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index ea2272f0f37e..a7072174ffa7 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -7913,11 +7913,6 @@ static int niu_set_phys_id(struct net_device *dev, | |||
7913 | return 0; | 7913 | return 0; |
7914 | } | 7914 | } |
7915 | 7915 | ||
7916 | static int niu_set_flags(struct net_device *dev, u32 data) | ||
7917 | { | ||
7918 | return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH); | ||
7919 | } | ||
7920 | |||
7921 | static const struct ethtool_ops niu_ethtool_ops = { | 7916 | static const struct ethtool_ops niu_ethtool_ops = { |
7922 | .get_drvinfo = niu_get_drvinfo, | 7917 | .get_drvinfo = niu_get_drvinfo, |
7923 | .get_link = ethtool_op_get_link, | 7918 | .get_link = ethtool_op_get_link, |
@@ -7934,8 +7929,6 @@ static const struct ethtool_ops niu_ethtool_ops = { | |||
7934 | .set_phys_id = niu_set_phys_id, | 7929 | .set_phys_id = niu_set_phys_id, |
7935 | .get_rxnfc = niu_get_nfc, | 7930 | .get_rxnfc = niu_get_nfc, |
7936 | .set_rxnfc = niu_set_nfc, | 7931 | .set_rxnfc = niu_set_nfc, |
7937 | .set_flags = niu_set_flags, | ||
7938 | .get_flags = ethtool_op_get_flags, | ||
7939 | }; | 7932 | }; |
7940 | 7933 | ||
7941 | static int niu_ldg_assign_ldn(struct niu *np, struct niu_parent *parent, | 7934 | 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 | 9757 | ||
9765 | static void __devinit niu_set_basic_features(struct net_device *dev) | 9758 | static void __devinit niu_set_basic_features(struct net_device *dev) |
9766 | { | 9759 | { |
9767 | dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM | | 9760 | dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXHASH; |
9768 | NETIF_F_GRO | NETIF_F_RXHASH); | 9761 | dev->features |= dev->hw_features | NETIF_F_RXCSUM; |
9769 | } | 9762 | } |
9770 | 9763 | ||
9771 | static int __devinit niu_pci_init_one(struct pci_dev *pdev, | 9764 | static int __devinit niu_pci_init_one(struct pci_dev *pdev, |