These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / brocade / bna / bnad.h

diff --git a/kernel/drivers/net/ethernet/brocade/bna/bnad.h b/kernel/drivers/net/ethernet/brocade/bna/bnad.h
index 7ead6c2..f4ed816 100644 (file)
--- a/kernel/drivers/net/ethernet/brocade/bna/bnad.h
+++ b/kernel/drivers/net/ethernet/brocade/bna/bnad.h
@@ -175,6 +175,7 @@ struct bnad_drv_stats {
        u64             tx_skb_headlen_zero;
        u64             tx_skb_frag_zero;
        u64             tx_skb_len_mismatch;
+       u64             tx_skb_map_failed;
 
        u64             hw_stats_updates;
        u64             netif_rx_dropped;
@@ -189,6 +190,7 @@ struct bnad_drv_stats {
        u64             rx_unmap_q_alloc_failed;
 
        u64             rxbuf_alloc_failed;
+       u64             rxbuf_map_failed;
 };
 
 /* Complete driver stats */
@@ -344,7 +346,7 @@ struct bnad {
        struct bnad_completion bnad_completions;
 
        /* Burnt in MAC address */
-       mac_t                   perm_addr;
+       u8                      perm_addr[ETH_ALEN];
 
        struct workqueue_struct *work_q;
 
@@ -385,7 +387,7 @@ u32 *cna_get_firmware_buf(struct pci_dev *pdev);
 /* Netdev entry point prototypes */
 void bnad_set_rx_mode(struct net_device *netdev);
 struct net_device_stats *bnad_get_netdev_stats(struct net_device *netdev);
-int bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr);
+int bnad_mac_addr_set_locked(struct bnad *bnad, const u8 *mac_addr);
 int bnad_enable_default_bcast(struct bnad *bnad);
 void bnad_restore_vlans(struct bnad *bnad, u32 rx_id);
 void bnad_set_ethtool_ops(struct net_device *netdev);