Later changes need to be able to refer to neighbour attributes when doing fdb_add. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/macvlan.c | 2 +- include/linux/netdevice.h | 4 +++- net/bridge/br_fdb.c | 3 ++- net/bridge/br_private.h | 2 +- net/core/rtnetlink.c | 6 ++++-- 6 files changed, 12 insertions(+), 7 deletions(-) --- a/drivers/net/macvlan.c 2012-09-28 09:28:48.899660128 -0700 +++ b/drivers/net/macvlan.c 2012-09-28 09:28:56.191588306 -0700 @@ -546,7 +546,7 @@ static int macvlan_vlan_rx_kill_vid(stru return 0; } -static int macvlan_fdb_add(struct ndmsg *ndm, +static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 flags) --- a/include/linux/netdevice.h 2012-09-28 09:28:53.439615417 -0700 +++ b/include/linux/netdevice.h 2012-09-28 09:28:56.191588306 -0700 @@ -904,7 +904,8 @@ struct netdev_fcoe_hbainfo { * feature set might be less than what was returned by ndo_fix_features()). * Must return >0 or -errno if it changed dev->features itself. * - * int (*ndo_fdb_add)(struct ndmsg *ndm, struct net_device *dev, + * int (*ndo_fdb_add)(struct ndmsg *ndm, struct nlattr *tb[], + * struct net_device *dev, * const unsigned char *addr, u16 flags) * Adds an FDB entry to dev for addr. * int (*ndo_fdb_del)(struct ndmsg *ndm, struct net_device *dev, @@ -1014,6 +1015,7 @@ struct net_device_ops { void (*ndo_neigh_destroy)(struct neighbour *n); int (*ndo_fdb_add)(struct ndmsg *ndm, + struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 flags); --- a/net/bridge/br_fdb.c 2012-09-28 09:28:48.899660128 -0700 +++ b/net/bridge/br_fdb.c 2012-09-28 09:28:56.191588306 -0700 @@ -608,7 +608,8 @@ static int fdb_add_entry(struct net_brid } /* Add new permanent fdb entry with RTM_NEWNEIGH */ -int br_fdb_add(struct ndmsg *ndm, struct net_device *dev, +int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], + struct net_device *dev, const unsigned char *addr, u16 nlh_flags) { struct net_bridge_port *p; --- a/net/bridge/br_private.h 2012-09-28 09:28:48.899660128 -0700 +++ b/net/bridge/br_private.h 2012-09-28 09:28:56.191588306 -0700 @@ -364,7 +364,7 @@ extern void br_fdb_update(struct net_bri extern int br_fdb_delete(struct ndmsg *ndm, struct net_device *dev, const unsigned char *addr); -extern int br_fdb_add(struct ndmsg *nlh, +extern int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 nlh_flags); --- a/net/core/rtnetlink.c 2012-09-28 09:28:48.899660128 -0700 +++ b/net/core/rtnetlink.c 2012-09-28 09:28:56.191588306 -0700 @@ -2090,7 +2090,8 @@ static int rtnl_fdb_add(struct sk_buff * if ((!ndm->ndm_flags || ndm->ndm_flags & NTF_MASTER) && (dev->priv_flags & IFF_BRIDGE_PORT)) { master = dev->master; - err = master->netdev_ops->ndo_fdb_add(ndm, dev, addr, + err = master->netdev_ops->ndo_fdb_add(ndm, tb, + dev, addr, nlh->nlmsg_flags); if (err) goto out; @@ -2100,7 +2101,8 @@ static int rtnl_fdb_add(struct sk_buff * /* Embedded bridge, macvlan, and any other device support */ if ((ndm->ndm_flags & NTF_SELF) && dev->netdev_ops->ndo_fdb_add) { - err = dev->netdev_ops->ndo_fdb_add(ndm, dev, addr, + err = dev->netdev_ops->ndo_fdb_add(ndm, tb, + dev, addr, nlh->nlmsg_flags); if (!err) { --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 2012-09-28 09:28:48.899660128 -0700 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 2012-09-28 09:28:56.195588265 -0700 @@ -6889,7 +6889,7 @@ static int ixgbe_set_features(struct net return 0; } -static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, +static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, u16 flags) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html