Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath6kl / main.c

diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index bd50b6b7b49267665e8854e388dd068fab63707b..d4fcfcad57d03df4d612708978286997c4c42a9e 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -345,39 +345,6 @@ out:
        return ret;
 }
 
-/* FIXME: move to a better place, target.h? */
-#define AR6003_RESET_CONTROL_ADDRESS 0x00004000
-#define AR6004_RESET_CONTROL_ADDRESS 0x00004000
-
-void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,
-                        bool wait_fot_compltn, bool cold_reset)
-{
-       int status = 0;
-       u32 address;
-       __le32 data;
-
-       if (target_type != TARGET_TYPE_AR6003 &&
-           target_type != TARGET_TYPE_AR6004)
-               return;
-
-       data = cold_reset ? cpu_to_le32(RESET_CONTROL_COLD_RST) :
-                           cpu_to_le32(RESET_CONTROL_MBOX_RST);
-
-       switch (target_type) {
-       case TARGET_TYPE_AR6003:
-               address = AR6003_RESET_CONTROL_ADDRESS;
-               break;
-       case TARGET_TYPE_AR6004:
-               address = AR6004_RESET_CONTROL_ADDRESS;
-               break;
-       }
-
-       status = ath6kl_diag_write32(ar, address, data);
-
-       if (status)
-               ath6kl_err("failed to reset target\n");
-}
-
 static void ath6kl_install_static_wep_keys(struct ath6kl_vif *vif)
 {
        u8 index;
@@ -1327,9 +1294,11 @@ void init_netdev(struct net_device *dev)
        dev->watchdog_timeo = ATH6KL_TX_TIMEOUT;
 
        dev->needed_headroom = ETH_HLEN;
-       dev->needed_headroom += sizeof(struct ath6kl_llc_snap_hdr) +
-                               sizeof(struct wmi_data_hdr) + HTC_HDR_LENGTH
-                               + WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES;
+       dev->needed_headroom += roundup(sizeof(struct ath6kl_llc_snap_hdr) +
+                                       sizeof(struct wmi_data_hdr) +
+                                       HTC_HDR_LENGTH +
+                                       WMI_MAX_TX_META_SZ +
+                                       ATH6KL_HTC_ALIGN_BYTES, 4);
 
        dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;