diff options
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index d93553f15e91..c27088d0541b 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -582,20 +582,6 @@ void lbs_host_to_card_done(struct lbs_private *priv) | |||
582 | } | 582 | } |
583 | EXPORT_SYMBOL_GPL(lbs_host_to_card_done); | 583 | EXPORT_SYMBOL_GPL(lbs_host_to_card_done); |
584 | 584 | ||
585 | /** | ||
586 | * @brief This function returns the network statistics | ||
587 | * | ||
588 | * @param dev A pointer to struct lbs_private structure | ||
589 | * @return A pointer to net_device_stats structure | ||
590 | */ | ||
591 | static struct net_device_stats *lbs_get_stats(struct net_device *dev) | ||
592 | { | ||
593 | struct lbs_private *priv = dev->ml_priv; | ||
594 | |||
595 | lbs_deb_enter(LBS_DEB_NET); | ||
596 | return &priv->stats; | ||
597 | } | ||
598 | |||
599 | static int lbs_set_mac_address(struct net_device *dev, void *addr) | 585 | static int lbs_set_mac_address(struct net_device *dev, void *addr) |
600 | { | 586 | { |
601 | int ret = 0; | 587 | int ret = 0; |
@@ -1201,7 +1187,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) | |||
1201 | dev->stop = lbs_eth_stop; | 1187 | dev->stop = lbs_eth_stop; |
1202 | dev->set_mac_address = lbs_set_mac_address; | 1188 | dev->set_mac_address = lbs_set_mac_address; |
1203 | dev->tx_timeout = lbs_tx_timeout; | 1189 | dev->tx_timeout = lbs_tx_timeout; |
1204 | dev->get_stats = lbs_get_stats; | 1190 | |
1205 | dev->watchdog_timeo = 5 * HZ; | 1191 | dev->watchdog_timeo = 5 * HZ; |
1206 | dev->ethtool_ops = &lbs_ethtool_ops; | 1192 | dev->ethtool_ops = &lbs_ethtool_ops; |
1207 | #ifdef WIRELESS_EXT | 1193 | #ifdef WIRELESS_EXT |
@@ -1443,7 +1429,6 @@ static int lbs_add_mesh(struct lbs_private *priv) | |||
1443 | mesh_dev->open = lbs_dev_open; | 1429 | mesh_dev->open = lbs_dev_open; |
1444 | mesh_dev->hard_start_xmit = lbs_hard_start_xmit; | 1430 | mesh_dev->hard_start_xmit = lbs_hard_start_xmit; |
1445 | mesh_dev->stop = lbs_mesh_stop; | 1431 | mesh_dev->stop = lbs_mesh_stop; |
1446 | mesh_dev->get_stats = lbs_get_stats; | ||
1447 | mesh_dev->set_mac_address = lbs_set_mac_address; | 1432 | mesh_dev->set_mac_address = lbs_set_mac_address; |
1448 | mesh_dev->ethtool_ops = &lbs_ethtool_ops; | 1433 | mesh_dev->ethtool_ops = &lbs_ethtool_ops; |
1449 | memcpy(mesh_dev->dev_addr, priv->dev->dev_addr, | 1434 | memcpy(mesh_dev->dev_addr, priv->dev->dev_addr, |
@@ -1648,14 +1633,6 @@ static int lbs_rtap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1648 | return NETDEV_TX_BUSY; | 1633 | return NETDEV_TX_BUSY; |
1649 | } | 1634 | } |
1650 | 1635 | ||
1651 | static struct net_device_stats *lbs_rtap_get_stats(struct net_device *dev) | ||
1652 | { | ||
1653 | struct lbs_private *priv = dev->ml_priv; | ||
1654 | lbs_deb_enter(LBS_DEB_NET); | ||
1655 | return &priv->stats; | ||
1656 | } | ||
1657 | |||
1658 | |||
1659 | static void lbs_remove_rtap(struct lbs_private *priv) | 1636 | static void lbs_remove_rtap(struct lbs_private *priv) |
1660 | { | 1637 | { |
1661 | lbs_deb_enter(LBS_DEB_MAIN); | 1638 | lbs_deb_enter(LBS_DEB_MAIN); |
@@ -1689,7 +1666,6 @@ static int lbs_add_rtap(struct lbs_private *priv) | |||
1689 | rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP; | 1666 | rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP; |
1690 | rtap_dev->open = lbs_rtap_open; | 1667 | rtap_dev->open = lbs_rtap_open; |
1691 | rtap_dev->stop = lbs_rtap_stop; | 1668 | rtap_dev->stop = lbs_rtap_stop; |
1692 | rtap_dev->get_stats = lbs_rtap_get_stats; | ||
1693 | rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; | 1669 | rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; |
1694 | rtap_dev->ml_priv = priv; | 1670 | rtap_dev->ml_priv = priv; |
1695 | SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent); | 1671 | SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent); |