--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-02-25 16:48:03.117609023 -0500

+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-02-25 17:00:43.073595414 -0500

@@ -64,7 +64,7 @@

            struct cfg80211_ibss_params *params);

 static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);

 static s32 wl_cfg80211_get_station(struct wiphy *wiphy,

-           struct net_device *dev, u8 *mac, struct station_info *sinfo);

+           struct net_device *dev, const u8 *mac, struct station_info *sinfo);

 static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,

            struct net_device *dev, bool enabled, s32 timeout);

 static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,

@@ -1387,7 +1387,7 @@

 	key_endian_to_host(&key);

 	params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);

-	memcpy(params.key, key.data, params.key_len);

+	memcpy((u8*) params.key, key.data, params.key_len);

 	if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {

 		return err;

@@ -1423,7 +1423,7 @@

 static s32

 wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,

-                        u8 *mac, struct station_info *sinfo)

+                        const u8 *mac, struct station_info *sinfo)

 {

 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);

 	scb_val_t scb_val;

@@ -1441,7 +1441,7 @@

 		WL_DBG(("Could not get rate (%d)\n", err));

 	} else {

 		rate = dtoh32(rate);

-		sinfo->filled |= STATION_INFO_TX_BITRATE;

+		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);

 		sinfo->txrate.legacy = rate * 5;

 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));

 	}

@@ -1454,7 +1454,7 @@

 			return err;

 		}

 		rssi = dtoh32(scb_val.val);

-		sinfo->filled |= STATION_INFO_SIGNAL;

+		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

 		sinfo->signal = rssi;

 		WL_DBG(("RSSI %d dBm\n", rssi));

 	}