system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 02:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: add option for setting skb flags before xmit

Browse source 
Allows setting of an skb's flags - if needed - when calling
ieee80211_subif_start_xmit().

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Liad Kaufman 2014-11-09 18:50:07 +02:00 committed by Johannes Berg
parent 760a52e80f
commit 24d342c514
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/mac80211/ieee80211_i.h
View file

@ -1625,6 +1625,9 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
void __ieee80211_subif_start_xmit(struct sk_buff *skb,
struct net_device *dev,
u32 info_flags);
void ieee80211_purge_tx_queue(struct ieee80211_hw *hw, void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
struct sk_buff_head *skbs); struct sk_buff_head *skbs);

21
net/mac80211/tx.c
View file

@ -1787,21 +1787,22 @@ static void ieee80211_tx_latency_start_msrmnt(struct ieee80211_local *local,
} }
/** /**
* ieee80211_subif_start_xmit - netif start_xmit function for Ethernet-type * __ieee80211_subif_start_xmit - netif start_xmit function for Ethernet-type
* subinterfaces (wlan#, WDS, and VLAN interfaces) * subinterfaces (wlan#, WDS, and VLAN interfaces)
* @skb: packet to be sent * @skb: packet to be sent
* @dev: incoming interface * @dev: incoming interface
* @info_flags: skb flags to set
* *
* Returns: NETDEV_TX_OK both on success and on failure. On failure skb will * On failure skb will be freed.
* be freed.
* *
* This function takes in an Ethernet header and encapsulates it with suitable * This function takes in an Ethernet header and encapsulates it with suitable
* IEEE 802.11 header based on which interface the packet is coming in. The * IEEE 802.11 header based on which interface the packet is coming in. The
* encapsulated packet will then be passed to master interface, wlan#.11, for * encapsulated packet will then be passed to master interface, wlan#.11, for
* transmission (through low-level driver). * transmission (through low-level driver).
*/ */
netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, void __ieee80211_subif_start_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev,
u32 info_flags)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
@ -1819,7 +1820,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
bool wme_sta = false, authorized = false, tdls_auth = false; bool wme_sta = false, authorized = false, tdls_auth = false;
bool tdls_peer = false, tdls_setup_frame = false; bool tdls_peer = false, tdls_setup_frame = false;
bool multicast; bool multicast;
u32 info_flags = 0;
u16 info_id = 0; u16 info_id = 0;
struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_chanctx_conf *chanctx_conf;
struct ieee80211_sub_if_data *ap_sdata; struct ieee80211_sub_if_data *ap_sdata;
@ -2224,15 +2224,20 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
ieee80211_xmit(sdata, skb, band); ieee80211_xmit(sdata, skb, band);
rcu_read_unlock(); rcu_read_unlock();
return NETDEV_TX_OK; return;
fail_rcu: fail_rcu:
rcu_read_unlock(); rcu_read_unlock();
fail: fail:
dev_kfree_skb(skb); dev_kfree_skb(skb);
return NETDEV_TX_OK;
} }
netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{
__ieee80211_subif_start_xmit(skb, dev, 0);
return NETDEV_TX_OK;
}
/* /*
* ieee80211_clear_tx_pending may not be called in a context where * ieee80211_clear_tx_pending may not be called in a context where