Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits)
  drivers/net/usb/asix.c: Fix pointer cast.
  be2net: Bug fix to avoid disabling bottom half during firmware upgrade.
  proc_dointvec: write a single value
  hso: add support for new products
  Phonet: fix potential use-after-free in pep_sock_close()
  ath9k: remove VEOL support for ad-hoc
  ath9k: change beacon allocation to prefer the first beacon slot
  sock.h: fix kernel-doc warning
  cls_cgroup: Fix build error when built-in
  macvlan: do proper cleanup in macvlan_common_newlink() V2
  be2net: Bug fix in init code in probe
  net/dccp: expansion of error code size
  ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep
  wireless: fix sta_info.h kernel-doc warnings
  wireless: fix mac80211.h kernel-doc warnings
  iwlwifi: testing the wrong variable in iwl_add_bssid_station()
  ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()
  ath9k_htc: dereferencing before check in hif_usb_tx_cb()
  rt2x00: Fix rt2800usb TX descriptor writing.
  rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions.
  ...

1 files changed, 21 insertions, 8 deletions

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index e125113759a5..6586b5c7e4b6 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1034,9 +1034,10 @@ static int enic_set_port_profile(struct enic *enic, u8 request, u8 *mac,
 {
         struct vic_provinfo *vp;
         u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
-        unsigned short *uuid;
+        u8 *uuid;
         char uuid_str[38];
-        static char *uuid_fmt = "%04X%04X-%04X-%04X-%04X-%04X%04X%04X";
+        static char *uuid_fmt = "%02X%02X%02X%02X-%02X%02X-%02X%02X-"
+                "%02X%02X-%02X%02X%02X%02X%0X%02X";
         int err;
 
         if (!name)
@@ -1058,20 +1059,24 @@ static int enic_set_port_profile(struct enic *enic, u8 request, u8 *mac,
                 ETH_ALEN, mac);
 
         if (instance_uuid) {
-                uuid = (unsigned short *)instance_uuid;
+                uuid = instance_uuid;
                 sprintf(uuid_str, uuid_fmt,
-                        uuid[0], uuid[1], uuid[2], uuid[3],
-                        uuid[4], uuid[5], uuid[6], uuid[7]);
+                        uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                        uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                        uuid[8],  uuid[9],  uuid[10], uuid[11],
+                        uuid[12], uuid[13], uuid[14], uuid[15]);
                 vic_provinfo_add_tlv(vp,
                         VIC_LINUX_PROV_TLV_CLIENT_UUID_STR,
                         sizeof(uuid_str), uuid_str);
         }
 
         if (host_uuid) {
-                uuid = (unsigned short *)host_uuid;
+                uuid = host_uuid;
                 sprintf(uuid_str, uuid_fmt,
-                        uuid[0], uuid[1], uuid[2], uuid[3],
-                        uuid[4], uuid[5], uuid[6], uuid[7]);
+                        uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                        uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                        uuid[8],  uuid[9],  uuid[10], uuid[11],
+                        uuid[12], uuid[13], uuid[14], uuid[15]);
                 vic_provinfo_add_tlv(vp,
                         VIC_LINUX_PROV_TLV_HOST_UUID_STR,
                         sizeof(uuid_str), uuid_str);
@@ -1127,6 +1132,14 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
         switch (request) {
         case PORT_REQUEST_ASSOCIATE:
 
+                /* If the interface mac addr hasn't been assigned,
+                 * assign a random mac addr before setting port-
+                 * profile.
+                 */
+
+                if (is_zero_ether_addr(netdev->dev_addr))
+                        random_ether_addr(netdev->dev_addr);
+
                 if (port[IFLA_PORT_PROFILE])
                         name = nla_data(port[IFLA_PORT_PROFILE]);