On 2/13/13 2:00 PM, "Vlad Yasevich" <vyasevic@xxxxxxxxxx> wrote:
>When a user adds bridge neighbors, allow him to specify VLAN id.
>If the VLAN id is not specified, the neighbor will be added
>for VLANs currently in the ports filter list. If no VLANs are
>configured on the port, we use vlan 0 and only add 1 entry.
>
>Signed-off-by: Vlad Yasevich <vyasevic@xxxxxxxxxx>
>---
>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
>drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 +
>drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +-
>drivers/net/macvlan.c | 2 +-
>drivers/net/vxlan.c | 3 +-
>include/linux/netdevice.h | 4 +-
>include/uapi/linux/neighbour.h | 1 +
>net/bridge/br_fdb.c | 148
>+++++++++++++++++++---
>net/bridge/br_private.h | 6 +-
>net/core/rtnetlink.c | 26 +++--
>10 files changed, 162 insertions(+), 35 deletions(-)
>
>diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>index b745194..b953168 100644
>--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
>@@ -247,8 +247,8 @@ static int qlcnic_set_mac(struct net_device *netdev,
>void *p)
> return 0;
>}
>-static int qlcnic_fdb_del(struct ndmsg *ndm, struct net_device *netdev,
>- const unsigned char *addr)
>+static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
>+ struct net_device *netdev, const unsigned char *addr)
>{
> struct qlcnic_adapter *adapter = netdev_priv(netdev);
> int err = -EOPNOTSUPP;
Thanks!
Acked-by: Jitendra Kalsaria <jitendra.kalsaria@xxxxxxxxxx>
