← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/linux-backports-modules-2.6.28/jaunty-proposed

« back to all changes in this revision

Viewing changes to updates/compat-wireless-2.6/net/mac80211/rx.c

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Tim Gardner
  • Date: 2009-02-09 17:48:22 UTC
  • Revision ID: james.westby@ubuntu.com-20090209174822-6chmiumgtavrmzgv
Tags: 2.6.28-7.5
[Tim Gardner]

* Update to master-2009-02-09
* Convert 'git-log' to 'git log'

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/compat-wireless-2.6/net/mac80211/rx.c
86
86
 
87
87
        if (status->flag & RX_FLAG_TSFT)
88
88
                len += 8;
89
 
        if (local->hw.flags & IEEE80211_HW_SIGNAL_DB ||
90
 
            local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
 
89
        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
91
90
                len += 1;
92
91
        if (local->hw.flags & IEEE80211_HW_NOISE_DBM)
93
92
                len += 1;
199
198
        *pos = status->antenna;
200
199
        pos++;
201
200
 
202
 
        /* IEEE80211_RADIOTAP_DB_ANTSIGNAL */
203
 
        if (local->hw.flags & IEEE80211_HW_SIGNAL_DB) {
204
 
                *pos = status->signal;
205
 
                rthdr->it_present |=
206
 
                        cpu_to_le32(1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL);
207
 
                pos++;
208
 
        }
209
 
 
210
201
        /* IEEE80211_RADIOTAP_DB_ANTNOISE is not used */
211
202
 
212
203
        /* IEEE80211_RADIOTAP_RX_FLAGS */
1233
1224
 
1234
1225
        switch (hdr->frame_control &
1235
1226
                cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
1236
 
        case __constant_cpu_to_le16(IEEE80211_FCTL_TODS):
 
1227
        case cpu_to_le16(IEEE80211_FCTL_TODS):
1237
1228
                if (unlikely(sdata->vif.type != NL80211_IFTYPE_AP &&
1238
1229
                             sdata->vif.type != NL80211_IFTYPE_AP_VLAN))
1239
1230
                        return -1;
1240
1231
                break;
1241
 
        case __constant_cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):
 
1232
        case cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS):
1242
1233
                if (unlikely(sdata->vif.type != NL80211_IFTYPE_WDS &&
1243
1234
                             sdata->vif.type != NL80211_IFTYPE_MESH_POINT))
1244
1235
                        return -1;
1252
1243
                        }
1253
1244
                }
1254
1245
                break;
1255
 
        case __constant_cpu_to_le16(IEEE80211_FCTL_FROMDS):
 
1246
        case cpu_to_le16(IEEE80211_FCTL_FROMDS):
1256
1247
                if (sdata->vif.type != NL80211_IFTYPE_STATION ||
1257
1248
                    (is_multicast_ether_addr(dst) &&
1258
1249
                     !compare_ether_addr(src, dev->dev_addr)))
1259
1250
                        return -1;
1260
1251
                break;
1261
 
        case __constant_cpu_to_le16(0):
 
1252
        case cpu_to_le16(0):
1262
1253
                if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
1263
1254
                        return -1;
1264
1255
                break;