← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/iwmc3200wifi/rx.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/iwmc3200wifi/rx.c
543
543
        switch (le32_to_cpu(complete->status)) {
544
544
        case UMAC_ASSOC_COMPLETE_SUCCESS:
545
545
                chan = ieee80211_get_channel(wiphy,
546
 
                        ieee80211_channel_to_frequency(complete->channel));
 
546
                        ieee80211_channel_to_frequency(complete->channel,
 
547
                                complete->band == UMAC_BAND_2GHZ ?
 
548
                                        IEEE80211_BAND_2GHZ :
 
549
                                        IEEE80211_BAND_5GHZ));
547
550
                if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) {
548
551
                        /* Associated to a unallowed channel, disassociate. */
549
552
                        __iwm_invalidate_mlme_profile(iwm);
562
565
                if (!test_and_clear_bit(IWM_STATUS_SME_CONNECTING, &iwm->status)
563
566
                    && iwm->conf.mode == UMAC_MODE_BSS) {
564
567
                        cancel_delayed_work(&iwm->disconnect);
565
 
                        cfg80211_roamed(iwm_to_ndev(iwm),
 
568
                        cfg80211_roamed(iwm_to_ndev(iwm), NULL,
566
569
                                        complete->bssid,
567
570
                                        iwm->req_ie, iwm->req_ie_len,
568
571
                                        iwm->resp_ie, iwm->resp_ie_len,
583
586
                                                WLAN_STATUS_SUCCESS,
584
587
                                                GFP_KERNEL);
585
588
                else
586
 
                        cfg80211_roamed(iwm_to_ndev(iwm),
 
589
                        cfg80211_roamed(iwm_to_ndev(iwm), NULL,
587
590
                                        complete->bssid,
588
591
                                        iwm->req_ie, iwm->req_ie_len,
589
592
                                        iwm->resp_ie, iwm->resp_ie_len,
841
844
                goto err;
842
845
        }
843
846
 
844
 
        freq = ieee80211_channel_to_frequency(umac_bss->channel);
 
847
        freq = ieee80211_channel_to_frequency(umac_bss->channel, band->band);
845
848
        channel = ieee80211_get_channel(wiphy, freq);
846
849
        signal = umac_bss->rssi * 100;
847
850
 
1573
1576
        IWM_HEXDUMP(iwm, DBG, RX, "A-MSDU: ", skb->data, skb->len);
1574
1577
 
1575
1578
        __skb_queue_head_init(&list);
1576
 
        ieee80211_amsdu_to_8023s(skb, &list, ndev->dev_addr, wdev->iftype, 0);
 
1579
        ieee80211_amsdu_to_8023s(skb, &list, ndev->dev_addr, wdev->iftype, 0,
 
1580
                                                                        true);
1577
1581
 
1578
1582
        while ((frame = __skb_dequeue(&list))) {
1579
1583
                ndev->stats.rx_packets++;