diff options
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 623ab4b16973..4a59306a3f05 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -181,7 +181,8 @@ u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] = | |||
181 | * @brief Get function for sysfs attribute anycast_mask | 181 | * @brief Get function for sysfs attribute anycast_mask |
182 | */ | 182 | */ |
183 | static ssize_t libertas_anycast_get(struct device * dev, | 183 | static ssize_t libertas_anycast_get(struct device * dev, |
184 | struct device_attribute *attr, char * buf) { | 184 | struct device_attribute *attr, char * buf) |
185 | { | ||
185 | struct cmd_ds_mesh_access mesh_access; | 186 | struct cmd_ds_mesh_access mesh_access; |
186 | 187 | ||
187 | memset(&mesh_access, 0, sizeof(mesh_access)); | 188 | memset(&mesh_access, 0, sizeof(mesh_access)); |
@@ -197,7 +198,8 @@ static ssize_t libertas_anycast_get(struct device * dev, | |||
197 | * @brief Set function for sysfs attribute anycast_mask | 198 | * @brief Set function for sysfs attribute anycast_mask |
198 | */ | 199 | */ |
199 | static ssize_t libertas_anycast_set(struct device * dev, | 200 | static ssize_t libertas_anycast_set(struct device * dev, |
200 | struct device_attribute *attr, const char * buf, size_t count) { | 201 | struct device_attribute *attr, const char * buf, size_t count) |
202 | { | ||
201 | struct cmd_ds_mesh_access mesh_access; | 203 | struct cmd_ds_mesh_access mesh_access; |
202 | uint32_t datum; | 204 | uint32_t datum; |
203 | 205 | ||
@@ -799,7 +801,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev) | |||
799 | dev->open = wlan_open; | 801 | dev->open = wlan_open; |
800 | dev->hard_start_xmit = wlan_pre_start_xmit; | 802 | dev->hard_start_xmit = wlan_pre_start_xmit; |
801 | dev->stop = wlan_close; | 803 | dev->stop = wlan_close; |
802 | dev->do_ioctl = libertas_do_ioctl; | ||
803 | dev->set_mac_address = wlan_set_mac_address; | 804 | dev->set_mac_address = wlan_set_mac_address; |
804 | dev->tx_timeout = wlan_tx_timeout; | 805 | dev->tx_timeout = wlan_tx_timeout; |
805 | dev->get_stats = wlan_get_stats; | 806 | dev->get_stats = wlan_get_stats; |
@@ -918,7 +919,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev) | |||
918 | mesh_dev->open = mesh_open; | 919 | mesh_dev->open = mesh_open; |
919 | mesh_dev->hard_start_xmit = mesh_pre_start_xmit; | 920 | mesh_dev->hard_start_xmit = mesh_pre_start_xmit; |
920 | mesh_dev->stop = mesh_close; | 921 | mesh_dev->stop = mesh_close; |
921 | mesh_dev->do_ioctl = libertas_do_ioctl; | ||
922 | mesh_dev->get_stats = wlan_get_stats; | 922 | mesh_dev->get_stats = wlan_get_stats; |
923 | mesh_dev->set_mac_address = wlan_set_mac_address; | 923 | mesh_dev->set_mac_address = wlan_set_mac_address; |
924 | mesh_dev->ethtool_ops = &libertas_ethtool_ops; | 924 | mesh_dev->ethtool_ops = &libertas_ethtool_ops; |