diff options
author | Vlad Yasevich <vyasevic@redhat.com> | 2013-02-13 07:00:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-13 19:42:16 -0500 |
commit | 1690be63a27b20ae65c792729a44f5970561ffa4 (patch) | |
tree | c0c86bc471e24207ee61b544c8683d84fc43d105 /include/linux/netdevice.h | |
parent | b0e9a30dd669a844bb4f74515f8bcd307018ffd0 (diff) |
bridge: Add vlan support to static neighbors
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@redhat.com>
Acked-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1964ca66df56..9deb672d999f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -884,7 +884,8 @@ struct netdev_fcoe_hbainfo { | |||
884 | * struct net_device *dev, | 884 | * struct net_device *dev, |
885 | * const unsigned char *addr, u16 flags) | 885 | * const unsigned char *addr, u16 flags) |
886 | * Adds an FDB entry to dev for addr. | 886 | * Adds an FDB entry to dev for addr. |
887 | * int (*ndo_fdb_del)(struct ndmsg *ndm, struct net_device *dev, | 887 | * int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[], |
888 | * struct net_device *dev, | ||
888 | * const unsigned char *addr) | 889 | * const unsigned char *addr) |
889 | * Deletes the FDB entry from dev coresponding to addr. | 890 | * Deletes the FDB entry from dev coresponding to addr. |
890 | * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb, | 891 | * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb, |
@@ -1008,6 +1009,7 @@ struct net_device_ops { | |||
1008 | const unsigned char *addr, | 1009 | const unsigned char *addr, |
1009 | u16 flags); | 1010 | u16 flags); |
1010 | int (*ndo_fdb_del)(struct ndmsg *ndm, | 1011 | int (*ndo_fdb_del)(struct ndmsg *ndm, |
1012 | struct nlattr *tb[], | ||
1011 | struct net_device *dev, | 1013 | struct net_device *dev, |
1012 | const unsigned char *addr); | 1014 | const unsigned char *addr); |
1013 | int (*ndo_fdb_dump)(struct sk_buff *skb, | 1015 | int (*ndo_fdb_dump)(struct sk_buff *skb, |