diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-28 14:40:49 -0400 |
commit | 6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db (patch) | |
tree | 8faea23112a11f52524eb413f71b7b02712d8b53 /drivers/net/wireless/brcm80211 | |
parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
parent | 6672d90fe779dc0dfffe027c3ede12609df091c2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/l2tp/l2tp_netlink.c
The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.
qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.
With help from Antonio Quartulli.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
4 files changed, 23 insertions, 13 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c index e0b313c7f5c..372f74eac1e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | |||
@@ -640,6 +640,8 @@ static int brcmf_sdio_pd_probe(struct platform_device *pdev) | |||
640 | 640 | ||
641 | oobirq_entry = kzalloc(sizeof(struct brcmf_sdio_oobirq), | 641 | oobirq_entry = kzalloc(sizeof(struct brcmf_sdio_oobirq), |
642 | GFP_KERNEL); | 642 | GFP_KERNEL); |
643 | if (!oobirq_entry) | ||
644 | return -ENOMEM; | ||
643 | oobirq_entry->irq = res->start; | 645 | oobirq_entry->irq = res->start; |
644 | oobirq_entry->flags = res->flags & IRQF_TRIGGER_MASK; | 646 | oobirq_entry->flags = res->flags & IRQF_TRIGGER_MASK; |
645 | list_add_tail(&oobirq_entry->list, &oobirq_lh); | 647 | list_add_tail(&oobirq_entry->list, &oobirq_lh); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c index f6b862d7798..8121dbabbff 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | |||
@@ -770,8 +770,11 @@ static void brcmf_c_arp_offload_set(struct brcmf_pub *drvr, int arp_mode) | |||
770 | { | 770 | { |
771 | char iovbuf[32]; | 771 | char iovbuf[32]; |
772 | int retcode; | 772 | int retcode; |
773 | __le32 arp_mode_le; | ||
773 | 774 | ||
774 | brcmf_c_mkiovar("arp_ol", (char *)&arp_mode, 4, iovbuf, sizeof(iovbuf)); | 775 | arp_mode_le = cpu_to_le32(arp_mode); |
776 | brcmf_c_mkiovar("arp_ol", (char *)&arp_mode_le, 4, iovbuf, | ||
777 | sizeof(iovbuf)); | ||
775 | retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, | 778 | retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, |
776 | iovbuf, sizeof(iovbuf)); | 779 | iovbuf, sizeof(iovbuf)); |
777 | retcode = retcode >= 0 ? 0 : retcode; | 780 | retcode = retcode >= 0 ? 0 : retcode; |
@@ -787,8 +790,11 @@ static void brcmf_c_arp_offload_enable(struct brcmf_pub *drvr, int arp_enable) | |||
787 | { | 790 | { |
788 | char iovbuf[32]; | 791 | char iovbuf[32]; |
789 | int retcode; | 792 | int retcode; |
793 | __le32 arp_enable_le; | ||
790 | 794 | ||
791 | brcmf_c_mkiovar("arpoe", (char *)&arp_enable, 4, | 795 | arp_enable_le = cpu_to_le32(arp_enable); |
796 | |||
797 | brcmf_c_mkiovar("arpoe", (char *)&arp_enable_le, 4, | ||
792 | iovbuf, sizeof(iovbuf)); | 798 | iovbuf, sizeof(iovbuf)); |
793 | retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, | 799 | retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, |
794 | iovbuf, sizeof(iovbuf)); | 800 | iovbuf, sizeof(iovbuf)); |
@@ -806,10 +812,10 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr) | |||
806 | char iovbuf[BRCMF_EVENTING_MASK_LEN + 12]; /* Room for | 812 | char iovbuf[BRCMF_EVENTING_MASK_LEN + 12]; /* Room for |
807 | "event_msgs" + '\0' + bitvec */ | 813 | "event_msgs" + '\0' + bitvec */ |
808 | char buf[128], *ptr; | 814 | char buf[128], *ptr; |
809 | u32 roaming = 1; | 815 | __le32 roaming_le = cpu_to_le32(1); |
810 | uint bcn_timeout = 3; | 816 | __le32 bcn_timeout_le = cpu_to_le32(3); |
811 | int scan_assoc_time = 40; | 817 | __le32 scan_assoc_time_le = cpu_to_le32(40); |
812 | int scan_unassoc_time = 40; | 818 | __le32 scan_unassoc_time_le = cpu_to_le32(40); |
813 | int i; | 819 | int i; |
814 | struct brcmf_bus_dcmd *cmdlst; | 820 | struct brcmf_bus_dcmd *cmdlst; |
815 | struct list_head *cur, *q; | 821 | struct list_head *cur, *q; |
@@ -835,14 +841,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr) | |||
835 | 841 | ||
836 | /* Setup timeout if Beacons are lost and roam is off to report | 842 | /* Setup timeout if Beacons are lost and roam is off to report |
837 | link down */ | 843 | link down */ |
838 | brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf, | 844 | brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout_le, 4, iovbuf, |
839 | sizeof(iovbuf)); | 845 | sizeof(iovbuf)); |
840 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, | 846 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, |
841 | sizeof(iovbuf)); | 847 | sizeof(iovbuf)); |
842 | 848 | ||
843 | /* Enable/Disable build-in roaming to allowed ext supplicant to take | 849 | /* Enable/Disable build-in roaming to allowed ext supplicant to take |
844 | of romaing */ | 850 | of romaing */ |
845 | brcmf_c_mkiovar("roam_off", (char *)&roaming, 4, | 851 | brcmf_c_mkiovar("roam_off", (char *)&roaming_le, 4, |
846 | iovbuf, sizeof(iovbuf)); | 852 | iovbuf, sizeof(iovbuf)); |
847 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, | 853 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, |
848 | sizeof(iovbuf)); | 854 | sizeof(iovbuf)); |
@@ -854,9 +860,9 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr) | |||
854 | sizeof(iovbuf)); | 860 | sizeof(iovbuf)); |
855 | 861 | ||
856 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_CHANNEL_TIME, | 862 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_CHANNEL_TIME, |
857 | (char *)&scan_assoc_time, sizeof(scan_assoc_time)); | 863 | (char *)&scan_assoc_time_le, sizeof(scan_assoc_time_le)); |
858 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_UNASSOC_TIME, | 864 | brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_UNASSOC_TIME, |
859 | (char *)&scan_unassoc_time, sizeof(scan_unassoc_time)); | 865 | (char *)&scan_unassoc_time_le, sizeof(scan_unassoc_time_le)); |
860 | 866 | ||
861 | /* Set and enable ARP offload feature */ | 867 | /* Set and enable ARP offload feature */ |
862 | brcmf_c_arp_offload_set(drvr, BRCMF_ARPOL_MODE); | 868 | brcmf_c_arp_offload_set(drvr, BRCMF_ARPOL_MODE); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 65cf8f92cb3..32ee05297cc 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -501,8 +501,10 @@ static void brcmf_iscan_prep(struct brcmf_scan_params_le *params_le, | |||
501 | params_le->active_time = cpu_to_le32(-1); | 501 | params_le->active_time = cpu_to_le32(-1); |
502 | params_le->passive_time = cpu_to_le32(-1); | 502 | params_le->passive_time = cpu_to_le32(-1); |
503 | params_le->home_time = cpu_to_le32(-1); | 503 | params_le->home_time = cpu_to_le32(-1); |
504 | if (ssid && ssid->SSID_len) | 504 | if (ssid && ssid->SSID_len) { |
505 | memcpy(¶ms_le->ssid_le, ssid, sizeof(struct brcmf_ssid)); | 505 | params_le->ssid_le.SSID_len = cpu_to_le32(ssid->SSID_len); |
506 | memcpy(¶ms_le->ssid_le.SSID, ssid->SSID, ssid->SSID_len); | ||
507 | } | ||
506 | } | 508 | } |
507 | 509 | ||
508 | static s32 | 510 | static s32 |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c index 7ed7d757702..64a48f06d68 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c | |||
@@ -77,7 +77,7 @@ | |||
77 | NL80211_RRF_NO_IBSS) | 77 | NL80211_RRF_NO_IBSS) |
78 | 78 | ||
79 | static const struct ieee80211_regdomain brcms_regdom_x2 = { | 79 | static const struct ieee80211_regdomain brcms_regdom_x2 = { |
80 | .n_reg_rules = 7, | 80 | .n_reg_rules = 6, |
81 | .alpha2 = "X2", | 81 | .alpha2 = "X2", |
82 | .reg_rules = { | 82 | .reg_rules = { |
83 | BRCM_2GHZ_2412_2462, | 83 | BRCM_2GHZ_2412_2462, |