projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
spider_net_ethtool.c
diff --git
a/drivers/net/spider_net_ethtool.c
b/drivers/net/spider_net_ethtool.c
index 85691d2a0be26a454e65550d867d4e59a0713119..5bae728c3820a01b00ace7672d1422fecc9d8aee 100644
(file)
--- a/
drivers/net/spider_net_ethtool.c
+++ b/
drivers/net/spider_net_ethtool.c
@@
-118,7
+118,7
@@
spider_net_ethtool_nway_reset(struct net_device *netdev)
static u32
spider_net_ethtool_get_rx_csum(struct net_device *netdev)
{
static u32
spider_net_ethtool_get_rx_csum(struct net_device *netdev)
{
- struct spider_net_card *card = netdev
->priv
;
+ struct spider_net_card *card = netdev
_priv(netdev)
;
return card->options.rx_csum;
}
return card->options.rx_csum;
}
@@
-126,7
+126,7
@@
spider_net_ethtool_get_rx_csum(struct net_device *netdev)
static int
spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
{
static int
spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
{
- struct spider_net_card *card = netdev
->priv
;
+ struct spider_net_card *card = netdev
_priv(netdev)
;
card->options.rx_csum = n;
return 0;
card->options.rx_csum = n;
return 0;
@@
-137,7
+137,7
@@
static void
spider_net_ethtool_get_ringparam(struct net_device *netdev,
struct ethtool_ringparam *ering)
{
spider_net_ethtool_get_ringparam(struct net_device *netdev,
struct ethtool_ringparam *ering)
{
- struct spider_net_card *card = netdev
->priv
;
+ struct spider_net_card *card = netdev
_priv(netdev)
;
ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
ering->tx_pending = card->tx_chain.num_desc;
ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
ering->tx_pending = card->tx_chain.num_desc;
@@
-158,7
+158,7
@@
static int spider_net_get_sset_count(struct net_device *netdev, int sset)
static void spider_net_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, u64 *data)
{
static void spider_net_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, u64 *data)
{
- struct spider_net_card *card = netdev
->priv
;
+ struct spider_net_card *card = netdev
_priv(netdev)
;
data[0] = netdev->stats.tx_packets;
data[1] = netdev->stats.tx_bytes;
data[0] = netdev->stats.tx_packets;
data[1] = netdev->stats.tx_bytes;