1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index e15cc71b826d..571452e786d5 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -733,7 +733,7 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
  * @ndev: network device
  * @vid:  VLAN vid to add
  */
-static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
+static int bdx_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         __bdx_vlan_rx_vid(ndev, vid, 1);
         return 0;
@@ -744,7 +744,7 @@ static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
  * @ndev: network device
  * @vid:  VLAN vid to kill
  */
-static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)
+static int bdx_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
 {
         __bdx_vlan_rx_vid(ndev, vid, 0);
         return 0;
@@ -1102,10 +1102,9 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f)
         dno = bdx_rxdb_available(db) - 1;
         while (dno > 0) {
                 skb = netdev_alloc_skb(priv->ndev, f->m.pktsz + NET_IP_ALIGN);
-                if (!skb) {
-                        pr_err("NO MEM: netdev_alloc_skb failed\n");
+                if (!skb)
                         break;
-                }
+
                 skb_reserve(skb, NET_IP_ALIGN);
 
                 idx = bdx_rxdb_alloc_elem(db);
@@ -1149,7 +1148,7 @@ NETIF_RX_MUX(struct bdx_priv *priv, u32 rxd_val1, u16 rxd_vlan,
                     priv->ndev->name,
                     GET_RXD_VLAN_ID(rxd_vlan),
                     GET_RXD_VTAG(rxd_val1));
-                __vlan_hwaccel_put_tag(skb, GET_RXD_VLAN_TCI(rxd_vlan));
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), GET_RXD_VLAN_TCI(rxd_vlan));
         }
         netif_receive_skb(skb);
 }
@@ -2018,12 +2017,12 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                  * so we can have them same for all ports of the board */
                 ndev->if_port = port;
                 ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO
-                    | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
-                    NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM
+                    | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
+                    NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM
                     /*| NETIF_F_FRAGLIST */
                     ;
                 ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_TSO | NETIF_F_HW_VLAN_TX;
+                        NETIF_F_TSO | NETIF_F_HW_VLAN_CTAG_TX;
 
                 if (pci_using_dac)
                         ndev->features |= NETIF_F_HIGHDMA;