diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2013-02-13 12:00:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-13 19:42:16 -0500 |
| commit | 1690be63a27b20ae65c792729a44f5970561ffa4 (patch) | |
| tree | c0c86bc471e24207ee61b544c8683d84fc43d105 /drivers/net/macvlan.c | |
| parent | b0e9a30dd669a844bb4f74515f8bcd307018ffd0 (diff) | |
| download | linux-3.10-1690be63a27b20ae65c792729a44f5970561ffa4.tar.gz linux-3.10-1690be63a27b20ae65c792729a44f5970561ffa4.tar.bz2 linux-3.10-1690be63a27b20ae65c792729a44f5970561ffa4.zip | |
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 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index e4b8078e88a..defcd8a8574 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -599,7 +599,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], return err; } -static int macvlan_fdb_del(struct ndmsg *ndm, +static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], struct net_device *dev, const unsigned char *addr) { |