d80211: Add control structure for beacontemplates
Subsystems (2)
PATCH v3 1/1 d80211: Add control structure for beacontemplates
Previous send v2 had a null pointer error in it.
When rt2500usb and rt73usb will start using beacontemplates, they would also need a control structure to be passed along to correctly set the tx parameters.
This patch will add a ieee80211_tx_control pointer to the ieee80211_if_init_conf structure. This pointer is only a reference to a local variable so drivers will not need to call kfree() on it.
Signed-off-by Ivo van Doorn <[email protected]>
---
include/net/d80211.h +3 -0
@@ -374,6 +374,8 @@ struct ieee80211_if_init_conf {* @beacon: beacon template. Valid only if @host_gen_beacon_template in * &struct ieee80211_hw is set. The driver is responsible of freeing * the sk_buff. +* @beacon_control: tx_control for the beacon template, this field is only +* valid when the @beacon field was set. * * This structure is passed to the config_interface() callback of * &struct ieee80211_hw.
@@ -386,6 +388,7 @@ struct ieee80211_if_conf {u8 *generic_elem;size_t generic_elem_len;struct sk_buff *beacon; +struct ieee80211_tx_control *beacon_control; }; typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
net/d80211/ieee80211.c +7 -4
@@ -1857,7 +1857,8 @@ ieee80211_get_buffered_bc(struct ieee802EXPORT_SYMBOL (ieee80211_get_buffered_bc);static int __ieee80211_if_config (struct net_device *dev, -struct sk_buff *beacon) +struct sk_buff *beacon, +struct ieee80211_tx_control *control) {struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct ieee80211_local *local = dev->ieee80211_ptr;
@@ -1881,6 +1882,7 @@ static int __ieee80211_if_config(struct conf.generic_elem = sdata->u.ap.generic_elem; conf.generic_elem_len = sdata->u.ap.generic_elem_len; conf.beacon = beacon; + conf.beacon_control = control; }return local->ops->config_interface (local_to_hw (local), dev->ifindex, &conf);
@@ -1888,20 +1890,21 @@ static int __ieee80211_if_config(structint ieee80211_if_config (struct net_device *dev) { -return __ieee80211_if_config (dev,NULL ); +return __ieee80211_if_config (dev,NULL ,NULL ); }int ieee80211_if_config_beacon (struct net_device *dev) {struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_tx_control control;struct sk_buff *skb;if (!(local->hw.flags &IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE ))return 0 ; - skb =ieee80211_beacon_get (local_to_hw (local), dev->ifindex,NULL ); + skb =ieee80211_beacon_get (local_to_hw (local), dev->ifindex, &control);if (!skb)return -ENOMEM ; -return __ieee80211_if_config (dev, skb); +return __ieee80211_if_config (dev, skb, &control); }int ieee80211_hw_config (struct ieee80211_local *local)
Quoted 8 lines · Ivo van Doorn
Previous send v2 had a null pointer error in it.
When rt2500usb and rt73usb will start using beacontemplates, they would also need a control structure to be passed along to correctly set the tx parameters.
This patch will add aieee80211_tx_controlpointer to theieee80211_if_init_confstructure. This pointer is only a reference to a local variable so drivers will not need to callkfree()on it.
Oh, sorry, this one seems to address my previous comment. Applied, thanks!
Jiri
Signature · 2 lines
Jiri Benc SUSE Labs