net: Use NULL to signal lack of promisc/multicast
[akaros.git] / kern / drivers / net / bnx2x / bnx2x_dcb.c
index 8ca60c9..7400456 100644 (file)
@@ -17,7 +17,7 @@
  *
  */
 
-#include "akaros_compat.h"
+#include <linux_compat.h>
 
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
@@ -179,7 +179,7 @@ static void bnx2x_dcbx_get_ap_priority(struct bnx2x *bp,
        }
 
        if (pri < MAX_PFC_PRIORITIES)
-               ttp[llfc_traf_type] = max_t(uint32_t, ttp[llfc_traf_type],
+               ttp[llfc_traf_type] = MAX_T(uint32_t, ttp[llfc_traf_type],
                                            pri);
 }
 
@@ -1698,10 +1698,9 @@ static void bnx2x_dcbx_cee_fill_cos_params(struct bnx2x *bp,
 
                        entry++;
                } else {
-                       need_num_of_entries =  min_t(uint8_t,
-                               (uint8_t)pg->num_of_dif_pri,
-                               (uint8_t)DCBX_COS_MAX_NUM_E3B0 -
-                                                help_data->num_of_pg + 1);
+                       need_num_of_entries =  MIN_T(uint8_t,
+                                                    (uint8_t)pg->num_of_dif_pri,
+                                                    (uint8_t)DCBX_COS_MAX_NUM_E3B0 - help_data->num_of_pg + 1);
                        /*
                         * If there are still VOQ-s which have no associated PG,
                         * then associate these VOQ-s to PG15. These PG-s will
@@ -1934,7 +1933,7 @@ static void bnx2x_dcbnl_get_perm_hw_addr(struct ether *netdev,
        DP(BNX2X_MSG_DCB, "GET-PERM-ADDR\n");
 
        /* first the HW mac address */
-       memcpy(perm_addr, netdev->dev_addr, netdev->addr_len);
+       memcpy(perm_addr, netdev->ea, netdev->addr_len);
 
        if (CNIC_LOADED(bp))
                /* second SAN address */