diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-04-13 16:58:25 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-04-22 11:25:30 +0200 |
| commit | 680a0daba74fed0bf30530c9b3e7e706cf29855f (patch) | |
| tree | 3022c5e0e3a3ec738c9d4f4ab6be50d152cc0fad /net | |
| parent | 2d981fddb0e4a5a4097d926f3b9fd3eaf25867a8 (diff) | |
| download | linux-680a0daba74fed0bf30530c9b3e7e706cf29855f.tar.gz linux-680a0daba74fed0bf30530c9b3e7e706cf29855f.tar.bz2 linux-680a0daba74fed0bf30530c9b3e7e706cf29855f.zip | |
mac80211: allow drivers to support S/G
If drivers want to support S/G (really just gather DMA on TX) then
we can now easily support this on the fast-xmit path since it just
needs to write to the ethernet header (and already has a check for
that being possible.)
However, disallow this on the regular TX path (which has to handle
fragmentation, software crypto, etc.) by calling skb_linearize().
Also allow the related HIGHDMA since that's not interesting to the
code in mac80211 at all anyway.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 2 | ||||
| -rw-r--r-- | net/mac80211/tx.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index df3051d96aff..6dd6dd47a9df 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -840,7 +840,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) /* Only HW csum features are currently compatible with mac80211 */ feature_whitelist = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | - NETIF_F_HW_CSUM; + NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_HIGHDMA; if (WARN_ON(hw->netdev_features & ~feature_whitelist)) return -EINVAL; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 20a90b16eb4d..3a421a04cbec 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2864,6 +2864,12 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, goto out; } + /* we cannot process non-linear frames on this path */ + if (skb_linearize(skb)) { + kfree_skb(skb); + goto out; + } + /* the frame could be fragmented, software-encrypted, and other things * so we cannot really handle checksum offload with it - fix it up in * software before we handle anything else. |