diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index b49f9f7..cb3ccbd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -640,6 +640,8 @@ static u16 iwl_adjust_beacon_interval(u16 beacon_val) u16 new_val = 0; u16 beacon_factor = 0; +printk(KERN_ERR "%s %d\n", __FILE__, __LINE__); +printk(KERN_ERR "%d\n", beacon_val); beacon_factor = (beacon_val + MAX_UCODE_BEACON_INTERVAL) / MAX_UCODE_BEACON_INTERVAL; new_val = beacon_val / beacon_factor; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 7f23858..77c17f3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -638,6 +638,8 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, if (bss) { /* set timing information */ sdata->vif.bss_conf.beacon_int = bss->cbss.beacon_interval; +printk(KERN_ERR "%s %d\n", __FILE__, __LINE__); +printk(KERN_ERR "%d\n", bss->cbss.beacon_interval); sdata->vif.bss_conf.timestamp = bss->cbss.tsf; sdata->vif.bss_conf.dtim_period = bss->dtim_period; diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 280dbcd..5a35ac3 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -219,6 +219,7 @@ struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy, { struct cfg80211_registered_device *dev = wiphy_to_dev(wiphy); struct cfg80211_internal_bss *bss, *res = NULL; + struct cfg80211_bss *ret; spin_lock_bh(&dev->bss_lock); @@ -236,8 +237,13 @@ struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy, spin_unlock_bh(&dev->bss_lock); if (!res) - return NULL; - return &res->pub; + ret = NULL; + else + ret = &res->pub; + +printk(KERN_ERR "%s %d\n", __FILE__, __LINE__); +printk(KERN_ERR "%p\n", ret); + return ret; } EXPORT_SYMBOL(cfg80211_get_bss); @@ -368,6 +374,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, } else if (found) { kref_get(&found->ref); found->pub.beacon_interval = res->pub.beacon_interval; +printk(KERN_ERR "%s %d\n", __FILE__, __LINE__); +printk(KERN_ERR "%p %d\n", &res->pub, res->pub.beacon_interval); found->pub.tsf = res->pub.tsf; found->pub.signal = res->pub.signal; found->pub.capability = res->pub.capability; @@ -416,6 +424,8 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy, res->pub.signal = signal; res->pub.tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp); res->pub.beacon_interval = le16_to_cpu(mgmt->u.probe_resp.beacon_int); +printk(KERN_ERR "%s %d\n", __FILE__, __LINE__); +printk(KERN_ERR "%p %d\n", &res->pub, res->pub.beacon_interval); res->pub.capability = le16_to_cpu(mgmt->u.probe_resp.capab_info); /* point to after the private area */ res->pub.information_elements = (u8 *)res + sizeof(*res) + privsz;