← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/net/wireless/ath/ath5k/mac80211-ops.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/ath/ath5k/mac80211-ops.c
282
282
        if (changes & BSS_CHANGED_BEACON_INT)
283
283
                sc->bintval = bss_conf->beacon_int;
284
284
 
 
285
        if (changes & BSS_CHANGED_ERP_SLOT) {
 
286
                int slot_time;
 
287
 
 
288
                ah->ah_short_slot = bss_conf->use_short_slot;
 
289
                slot_time = ath5k_hw_get_default_slottime(ah) +
 
290
                            3 * ah->ah_coverage_class;
 
291
                ath5k_hw_set_ifs_intervals(ah, slot_time);
 
292
        }
 
293
 
285
294
        if (changes & BSS_CHANGED_ASSOC) {
286
295
                avf->assoc = bss_conf->assoc;
287
296
                if (bss_conf->assoc)