From 9c4a00eec2cd62909d3c60d1f2d7e54ef9c97586 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 11 Feb 2009 20:27:30 +0100 Subject: [PATCH] --- yaml --- r: 134828 b: refs/heads/master c: 076ae609d20901b5fd9bc19fc4c245624c423970 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 1 + trunk/net/mac80211/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 05920b12b5cc..a9e9576d2445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53d6f81c7814690ba096584c733e5deaa34fdd8a +refs/heads/master: 076ae609d20901b5fd9bc19fc4c245624c423970 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index df94b9365264..e8221180b6c1 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -798,6 +798,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); + ndev->features |= NETIF_F_NETNS_LOCAL; /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ sdata = netdev_priv(ndev); diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index 5667f4e8067f..795f8c4a9fa0 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/net/mac80211/main.c @@ -916,6 +916,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) memcpy(local->mdev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); SET_NETDEV_DEV(local->mdev, wiphy_dev(local->hw.wiphy)); + local->mdev->features |= NETIF_F_NETNS_LOCAL; result = register_netdevice(local->mdev); if (result < 0)