Author: marek Date: 2010-06-17 10:55:18 +0200 (Thu, 17 Jun 2010) New Revision: 1699

Modified: trunk/batman-adv-kernelland/hard-interface.c Log: batman-adv: use rx_handler_data pointer to store net_bridge_port pointer

Register net_bridge_port pointer as rx_handler data pointer. As br_port is removed from struct net_device, another netdev priv_flag is added to indicate the device serves as a bridge port. Also rcuized pointers are now correctly dereferenced in br_fdb.c and in netfilter parts.

Signed-off-by: Jiri Pirko jpirko@redhat.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

Modified: trunk/batman-adv-kernelland/hard-interface.c =================================================================== --- trunk/batman-adv-kernelland/hard-interface.c 2010-06-10 07:50:33 UTC (rev 1698) +++ trunk/batman-adv-kernelland/hard-interface.c 2010-06-17 08:55:18 UTC (rev 1699) @@ -74,7 +74,7 @@ #endif

/* Device is being bridged */ - /* if (net_dev->br_port != NULL) + /* if (net_dev->priv_flags & IFF_BRIDGE_PORT) return 0; */

return 1;