summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2012-05-10 16:18:26 +0300
committerJohn W. Linville <linville@tuxdriver.com>2012-06-05 15:21:46 -0400
commit72d7872852e1734e94686012a2e9deade3457329 (patch)
treea03e04cbb654ddd44132b420e068a6e0a24d8f86 /net
parentf8f5701bdaf9134b1f90e5044a82c66324d2073f (diff)
downloadblackbird-op-linux-72d7872852e1734e94686012a2e9deade3457329.tar.gz
blackbird-op-linux-72d7872852e1734e94686012a2e9deade3457329.zip
mac80211: allow low-level drivers to set netdev feature bits
Low level drivers can now set certain netdev feature bits in netdev_features member of the ieee80211_hw struct. These will be propagated to every netdev created from this HW. The white-listed features currently include only ones related to HW checksumming. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/iface.c2
-rw-r--r--net/mac80211/main.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d4c19a7773db..f970e0b3c4b9 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1352,6 +1352,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
sdata->u.mgd.use_4addr = params->use_4addr;
}
+ ndev->features |= local->hw.netdev_features;
+
ret = register_netdevice(ndev);
if (ret)
goto fail;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index f5548e953259..779ac613ee57 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -682,6 +682,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
enum ieee80211_band band;
int channels, max_bitrates;
bool supp_ht;
+ netdev_features_t feature_whitelist;
static const u32 cipher_suites[] = {
/* keep WEP first, it may be removed below */
WLAN_CIPHER_SUITE_WEP40,
@@ -708,6 +709,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
if ((hw->flags & IEEE80211_HW_SCAN_WHILE_IDLE) && !local->ops->hw_scan)
return -EINVAL;
+ /* Only HW csum features are currently compatible with mac80211 */
+ feature_whitelist = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+ NETIF_F_HW_CSUM;
+ if (WARN_ON(hw->netdev_features & ~feature_whitelist))
+ return -EINVAL;
+
if (hw->max_report_rates == 0)
hw->max_report_rates = hw->max_rates;
OpenPOWER on IntegriCloud