diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/net/wireless/ipw2x00 | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/net/wireless/ipw2x00')
| -rw-r--r-- | kernel/drivers/net/wireless/ipw2x00/ipw2100.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/net/wireless/ipw2x00/ipw2100.h | 2 | ||||
| -rw-r--r-- | kernel/drivers/net/wireless/ipw2x00/ipw2200.c | 1 | ||||
| -rw-r--r-- | kernel/drivers/net/wireless/ipw2x00/libipw_rx.c | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/kernel/drivers/net/wireless/ipw2x00/ipw2100.c b/kernel/drivers/net/wireless/ipw2x00/ipw2100.c index 08eb229e7..36818c7f3 100644 --- a/kernel/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/kernel/drivers/net/wireless/ipw2x00/ipw2100.c @@ -1410,7 +1410,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv) static int ipw2100_hw_phy_off(struct ipw2100_priv *priv) { -#define HW_PHY_OFF_LOOP_DELAY (HZ / 5000) +#define HW_PHY_OFF_LOOP_DELAY (msecs_to_jiffies(50)) struct host_command cmd = { .host_command = CARD_DISABLE_PHY_OFF, diff --git a/kernel/drivers/net/wireless/ipw2x00/ipw2100.h b/kernel/drivers/net/wireless/ipw2x00/ipw2100.h index c6d78790c..193947865 100644 --- a/kernel/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/kernel/drivers/net/wireless/ipw2x00/ipw2100.h @@ -746,7 +746,7 @@ struct ipw2100_priv { #define IPW_REG_GPIO IPW_REG_DOMAIN_0_OFFSET + 0x0030 #define IPW_REG_FW_TYPE IPW_REG_DOMAIN_1_OFFSET + 0x0188 #define IPW_REG_FW_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x018C -#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190 +#define IPW_REG_FW_COMPATIBILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190 #define IPW_REG_INDIRECT_ADDR_MASK 0x00FFFFFC diff --git a/kernel/drivers/net/wireless/ipw2x00/ipw2200.c b/kernel/drivers/net/wireless/ipw2x00/ipw2200.c index 39f3e6f5c..ed0adaf1e 100644 --- a/kernel/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/kernel/drivers/net/wireless/ipw2x00/ipw2200.c @@ -10470,7 +10470,6 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev, vers, date); strlcpy(info->bus_info, pci_name(p->pci_dev), sizeof(info->bus_info)); - info->eedump_len = IPW_EEPROM_IMAGE_SIZE; } static u32 ipw_ethtool_get_link(struct net_device *dev) diff --git a/kernel/drivers/net/wireless/ipw2x00/libipw_rx.c b/kernel/drivers/net/wireless/ipw2x00/libipw_rx.c index a6877dd6b..cef7f7d79 100644 --- a/kernel/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/kernel/drivers/net/wireless/ipw2x00/libipw_rx.c @@ -1091,8 +1091,6 @@ static const char *get_info_element_string(u16 id) MFIE_STRING(TIM); MFIE_STRING(IBSS_PARAMS); MFIE_STRING(COUNTRY); - MFIE_STRING(HP_PARAMS); - MFIE_STRING(HP_TABLE); MFIE_STRING(REQUEST); MFIE_STRING(CHALLENGE); MFIE_STRING(PWR_CONSTRAINT); |