Commit 22981e0e authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman

staging: vt6655: Use net_device_stats from struct net_device

Instead of using an own copy of struct net_device_stats in struct
vnt_private, use stats from struct net_device. Also remove the thus
unnecessary device_get_stats(), as it would now just return
netdev->stats, which is the default in dev_get_stats().
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46ef6886
...@@ -335,7 +335,6 @@ struct vnt_private { ...@@ -335,7 +335,6 @@ struct vnt_private {
// netdev // netdev
struct net_device *dev; struct net_device *dev;
struct net_device_stats stats;
//dma addr, rx/tx pool //dma addr, rx/tx pool
dma_addr_t pool_dma; dma_addr_t pool_dma;
......
...@@ -264,7 +264,6 @@ static void vt6655_init_info(struct pci_dev *pcid, ...@@ -264,7 +264,6 @@ static void vt6655_init_info(struct pci_dev *pcid,
static void device_free_info(struct vnt_private *pDevice); static void device_free_info(struct vnt_private *pDevice);
static bool device_get_pci_info(struct vnt_private *, struct pci_dev *pcid); static bool device_get_pci_info(struct vnt_private *, struct pci_dev *pcid);
static void device_print_info(struct vnt_private *pDevice); static void device_print_info(struct vnt_private *pDevice);
static struct net_device_stats *device_get_stats(struct net_device *dev);
static void device_init_diversity_timer(struct vnt_private *pDevice); static void device_init_diversity_timer(struct vnt_private *pDevice);
static int device_open(struct net_device *dev); static int device_open(struct net_device *dev);
static int device_xmit(struct sk_buff *skb, struct net_device *dev); static int device_xmit(struct sk_buff *skb, struct net_device *dev);
...@@ -807,7 +806,6 @@ static const struct net_device_ops device_netdev_ops = { ...@@ -807,7 +806,6 @@ static const struct net_device_ops device_netdev_ops = {
.ndo_open = device_open, .ndo_open = device_open,
.ndo_stop = device_close, .ndo_stop = device_close,
.ndo_do_ioctl = device_ioctl, .ndo_do_ioctl = device_ioctl,
.ndo_get_stats = device_get_stats,
.ndo_start_xmit = device_xmit, .ndo_start_xmit = device_xmit,
.ndo_set_rx_mode = device_set_multi, .ndo_set_rx_mode = device_set_multi,
}; };
...@@ -1406,7 +1404,7 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx) ...@@ -1406,7 +1404,7 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
unsigned char byTsr1; unsigned char byTsr1;
unsigned int uFrameSize, uFIFOHeaderSize; unsigned int uFrameSize, uFIFOHeaderSize;
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
struct net_device_stats *pStats = &pDevice->stats; struct net_device_stats *pStats = &pDevice->dev->stats;
struct sk_buff *skb; struct sk_buff *skb;
unsigned int uNodeIndex; unsigned int uNodeIndex;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
...@@ -2587,13 +2585,6 @@ static void device_set_multi(struct net_device *dev) { ...@@ -2587,13 +2585,6 @@ static void device_set_multi(struct net_device *dev) {
pr_debug("pDevice->byRxMode = %x\n", pDevice->byRxMode); pr_debug("pDevice->byRxMode = %x\n", pDevice->byRxMode);
} }
static struct net_device_stats *device_get_stats(struct net_device *dev)
{
struct vnt_private *pDevice = netdev_priv(dev);
return &pDevice->stats;
}
static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct vnt_private *pDevice = netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
......
...@@ -274,7 +274,7 @@ device_receive_frame( ...@@ -274,7 +274,7 @@ device_receive_frame(
) )
{ {
PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo; PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo;
struct net_device_stats *pStats = &pDevice->stats; struct net_device_stats *pStats = &pDevice->dev->stats;
struct sk_buff *skb; struct sk_buff *skb;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = &(pDevice->pMgmt->sRxPacket); PSRxMgmtPacket pRxPacket = &(pDevice->pMgmt->sRxPacket);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment