Repository : ssh://git@open-mesh.org/batman-adv
Branch 'maint' now includes:
879ffa2 batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet
544f94c batman-adv: add seqno maximum age and protection start flag parameters
06b58ea Merge branch 'next'
1a19216 Merge branch 'next'
770d7c1 Merge branch 'next'
5fe476a batman-adv: Switch to HTTPS version of links
5f01697 batman-adv: Add lockdep assert for container_list_lock
03cb7fe Merge branch 'next'
319057e Merge branch 'next'
ee0e93f batman-adv: update copyright years for 2016
ab08dfe batman-adv: Fix kernel-doc for batadv_claim_free_ref
839de35 Merge branch 'next'
407e265 Merge branch 'next'
c7387df batman-adv: Add compatibility code for kref_get_unless_zero
ae315bc batman-adv: Convert batadv_hardif_neigh_node to kref
1faa4d8 batman-adv: Convert batadv_gw_node to kref
395c567 batman-adv: Convert batadv_softif_vlan to kref
cda4d54 batman-adv: Convert batadv_bla_backbone_gw to kref
b7a53be batman-adv: Convert batadv_bla_claim to kref
a3e8d4b batman-adv: Convert batadv_nc_node to kref
2d3c3d3 batman-adv: Convert batadv_nc_path to kref
4952250 batman-adv: Convert batadv_dat_entry to kref
dd62ee6 batman-adv: Convert batadv_tvlv_container to kref
88c5eb2 batman-adv: Convert batadv_tvlv_handler to kref
d63fa57 batman-adv: Convert batadv_tt_orig_list_entry to kref
c12b7f8 batman-adv: Convert batadv_neigh_ifinfo to kref
0d559d4 batman-adv: Convert batadv_orig_ifinfo to kref
b4dc027 batman-adv: Convert batadv_neigh_node to kref
9fa8c05 batman-adv: Convert batadv_hard_iface to kref
33b1d7c batman-adv: Convert batadv_orig_node_vlan to kref
090a800 batman-adv: Convert batadv_orig_node to kref
b81bdae batman-adv: Convert batadv_tt_common_entry to kref
82b7d70 batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant
0259f43 batman-adv: Rename batadv_orig_node *_free_ref function to *_put
321db7d batman-adv: Rename batadv_hardif *_free_ref function to *_put
b68dce4 batman-adv: Rename batadv_neigh_node *_free_ref function to *_put
4c9ec87 batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put
ff766a4 batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put
f645d8a batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put
b66a782 batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put
2980c7d batman-adv: Rename batadv_claim *_free_ref function to *_put
5491a0b batman-adv: Rename batadv_dat_entry *_free_ref function to *_put
d581bd3 batman-adv: Rename batadv_gw_node *_free_ref function to *_put
f4fa52f batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put
9823941 batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put
8747283 batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put
71fc703 batman-adv: Rename batadv_nc_node *_free_ref function to *_put
3dcd7b5 batman-adv: Rename batadv_nc_path *_free_ref function to *_put
c2ac707 batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put
004dddd batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put
88552f4 batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put
dcd61a7 batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put
ec46535 batman-adv: Add hard_iface specific sysfs wrapper macros for UINT
a4b88af batman-adv: ELP - adding basic infrastructure
2c2fe0b batman-adv: ELP - creating neighbor structures
82da7d6 batman-adv: ELP - adding sysfs parameter for elp interval
6328353 batman-adv: OGMv2 - add basic infrastructure
667996e batman-adv: OGMv2 - implement originators logic
c513176 batman-adv: add throughput override attribute to hard_ifaces
cdc4545 batman-adv: keep track of when unicast packets are sent
5c32451 batman-adv: ELP - compute the metric based on the estimated throughput
bedcadf batman-adv: ELP - send unicast ELP packets for throughput sampling
b05bbab batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls
662b7c1 batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API
342f7f3 batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API
ecdc9bc batman-adv: Start new development cycle
74a41ef Merge branch 'next'
a23e9a9 batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2
d5e8ba8 batman-adv: Ignore temporary files in git-status/git-add/...
ec7952f batman-adv: add missing kernel doc
c59b8c7 batman-adv: convert wifi driver throughput to multiples of 100kbps
41d1e61 batman-adv: fix misleading default throughput warning
de6db08 Merge branch 'maint' into next
2a89d10 Merge branch 'maint' into next
2e0a297 batman-adv: Depend on CFG80211 for BATMAN_V
7028cda Merge branch 'maint' into next
4030943 Merge branch 'maint' into next
3515604 batman-adv: ELP - use new ethtool_link_get_ksettings API
e9d8868 Merge branch 'maint' into next
9e5e037 batman-adv: init neigh node last seen field
fbb98aa batman-adv: Deactive TO_BE_ACTIVATED hardif on shutdown
d105968 Merge branch 'maint' into next
4735b46 batman-adv: clarify CFG80211 dependency
15c5834 batman-adv: Update compatible kernel version number
289e386 batman-adv: Fix broadcast/ogm queue limit on a removed interface
8771ce1 Merge branch 'maint' into next
69cfb8b batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event
20ca393 batman-adv: Fix reference counting of vlan object for tt_local_entry
a198a23 batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node
01a3aa4 batman-adv: Update CHANGELOG for upcoming release
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 34199a6677e8105204ec12978f67381e7715e0ec
Author: Andrew Lunn <andrew(a)lunn.ch>
Date: Tue Mar 1 22:19:05 2016 +0100
batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves
The batX soft interface should not be moved between network name
spaces. This is similar to bridges, bonds, tunnels, which are not
allowed to move between network namespaces.
Suggested-by: Daniel Ehlers <danielehlers(a)mindeye.net>
Signed-off-by: Andrew Lunn <andrew(a)lunn.ch>
Acked-by: Antonio Quartulli <a(a)unstable.cc>
Reviewed-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
34199a6677e8105204ec12978f67381e7715e0ec
net/batman-adv/soft-interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 674f24b..f1ac60e 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -972,7 +972,7 @@ static void batadv_softif_init_early(struct net_device *dev)
dev->netdev_ops = &batadv_netdev_ops;
dev->destructor = batadv_softif_free;
- dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+ dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL;
dev->priv_flags |= IFF_NO_QUEUE;
/* can't call min_mtu, because the needed variables