← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to net/mac80211/tx.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/mac80211/tx.c
1478
1478
                                if (sdata->vif.type != NL80211_IFTYPE_AP)
1479
1479
                                        continue;
1480
1480
                                if (compare_ether_addr(sdata->dev->dev_addr,
1481
 
                                                       hdr->addr2) == 0) {
 
1481
                                                       hdr->addr2)) {
1482
1482
                                        dev_hold(sdata->dev);
1483
1483
                                        dev_put(odev);
1484
1484
                                        osdata = sdata;
1736
1736
        if (!is_multicast_ether_addr(hdr.addr1)) {
1737
1737
                rcu_read_lock();
1738
1738
                sta = sta_info_get(local, hdr.addr1);
1739
 
                /* XXX: in the future, use sdata to look up the sta */
1740
 
                if (sta && sta->sdata == sdata)
 
1739
                if (sta)
1741
1740
                        sta_flags = get_sta_flags(sta);
1742
1741
                rcu_read_unlock();
1743
1742
        }