d80211: allow NULL for control in beacon_get
Subsystems (2)
PATCH 1/1 d80211: allow NULL for control in beacon_get
bcm43xx has no use for the "control" data provided by ieee80211_beacon_get(), so allow passing a NULL pointer to avoid setting up a dummy struct and throwing the data away afterwards in the driver.
Signed-off-by Michael Buesch <[email protected]>
net/d80211/ieee80211.c +21 -19
@@ -1683,28 +1683,30 @@memcpy (skb_put (skb, bt_len), b_tail, bt_len); } -memset (&extra,0 ,sizeof (extra)); - extra.endidx = local->num_curr_rates; +if (control) { +memset (&extra,0 ,sizeof (extra)); + extra.endidx = local->num_curr_rates; - rate =rate_control_get_rate (dev, skb, &extra); -if (rate ==NULL ) { -if (net_ratelimit ()) { -printk (KERN_DEBUG "%s: ieee80211_beacon_get: no rate " -"found\n" , dev->name); + rate =rate_control_get_rate (dev, skb, &extra); +if (rate ==NULL ) { +if (net_ratelimit ()) { +printk (KERN_DEBUG "%s: ieee80211_beacon_get: no rate " +"found\n" , dev->name); + } +dev_kfree_skb (skb); +return NULL ; } -dev_kfree_skb (skb); -return NULL ; - } - control->tx_rate = (local->short_preamble && - (rate->flags &IEEE80211_RATE_PREAMBLE2 )) ? - rate->val2 : rate->val; - control->antenna_sel = local->conf.antenna_sel; - control->power_level = local->conf.power_level; - control->no_ack =1 ; - control->retry_limit =1 ; - control->rts_cts_duration =0 ; - control->clear_dst_mask =1 ; + control->tx_rate = (local->short_preamble && + (rate->flags &IEEE80211_RATE_PREAMBLE2 )) ? + rate->val2 : rate->val; + control->antenna_sel = local->conf.antenna_sel; + control->power_level = local->conf.power_level; + control->no_ack =1 ; + control->retry_limit =1 ; + control->rts_cts_duration =0 ; + control->clear_dst_mask =1 ; + } ap->num_beacons++;return skb;
Signature · 1 line
Greetings Michael.