Merge tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[cascardo/linux.git] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_main.c

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index a913b3a..1aa25b1 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -376,13 +376,14 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
 }
 
 static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
-                       struct net_device *netdev, const unsigned char *addr)
+                       struct net_device *netdev,
+                       const unsigned char *addr, u16 vid)
 {
        struct qlcnic_adapter *adapter = netdev_priv(netdev);
        int err = -EOPNOTSUPP;
 
        if (!adapter->fdb_mac_learn)
-               return ndo_dflt_fdb_del(ndm, tb, netdev, addr);
+               return ndo_dflt_fdb_del(ndm, tb, netdev, addr, vid);
 
        if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) ||
            qlcnic_sriov_check(adapter)) {
@@ -401,13 +402,13 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
 
 static int qlcnic_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                        struct net_device *netdev,
-                       const unsigned char *addr, u16 flags)
+                       const unsigned char *addr, u16 vid, u16 flags)
 {
        struct qlcnic_adapter *adapter = netdev_priv(netdev);
        int err = 0;
 
        if (!adapter->fdb_mac_learn)
-               return ndo_dflt_fdb_add(ndm, tb, netdev, addr, flags);
+               return ndo_dflt_fdb_add(ndm, tb, netdev, addr, vid, flags);
 
        if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) &&
            !qlcnic_sriov_check(adapter)) {
@@ -460,7 +461,7 @@ static void qlcnic_82xx_cancel_idc_work(struct qlcnic_adapter *adapter)
 }
 
 static int qlcnic_get_phys_port_id(struct net_device *netdev,
-                                  struct netdev_phys_port_id *ppid)
+                                  struct netdev_phys_item_id *ppid)
 {
        struct qlcnic_adapter *adapter = netdev_priv(netdev);
        struct qlcnic_hardware_context *ahw = adapter->ahw;