Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -urN broadcom-orig/Makefile broadcom-sta/Makefile
- --- broadcom-orig/Makefile 2014-06-26 13:42:08.000000000 +0300
- +++ broadcom-sta/Makefile 2015-02-07 14:24:22.622027252 +0200
- @@ -146,4 +146,4 @@
- KBUILD_NOPEDANTIC=1 make -C $(KBUILD_DIR) M=`pwd` clean
- install:
- - install -D -m 755 wl.ko $(MDEST_DIR)
- + install -D -m 644 wl.ko $(MDEST_DIR)/wl.ko
- diff -urN broadcom-orig/src/wl/sys/wl_cfg80211_hybrid.c broadcom-sta/src/wl/sys/wl_cfg80211_hybrid.c
- --- broadcom-orig/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 13:42:08.000000000 +0300
- +++ broadcom-sta/src/wl/sys/wl_cfg80211_hybrid.c 2015-04-18 13:59:59.336457287 +0300
- @@ -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,
- @@ -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));
- }
- @@ -2010,9 +2010,10 @@
- notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
- notify_ielen = le32_to_cpu(bi->ie_length);
- - cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
- - 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
- - (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
- + cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN,
- + (const u8 *)(bi->BSSID.octet), 0, beacon_proberesp->capab_info,
- + beacon_proberesp->beacon_int, (const u8 *)notify_ie,
- + notify_ielen, signal, GFP_KERNEL);
- if (unlikely(!cbss))
- return -ENOMEM;
- @@ -2071,7 +2072,7 @@
- wl_get_assoc_ies(wl);
- memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
- wl_update_bss_info(wl);
- - cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
- + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, &wl->conf->channel, GFP_KERNEL);
- set_bit(WL_STATUS_CONNECTED, &wl->status);
- wl->profile->active = true;
- }
- diff -urN broadcom-orig/src/wl/sys/wl_linux.c broadcom-sta/src/wl/sys/wl_linux.c
- --- broadcom-orig/src/wl/sys/wl_linux.c 2014-06-26 13:42:08.000000000 +0300
- +++ broadcom-sta/src/wl/sys/wl_linux.c 2015-02-19 14:12:34.129003364 +0200
- @@ -1307,7 +1307,7 @@
- dev->priv = priv_link;
- #else
- - dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
- + dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup);
- if (!dev) {
- WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
- (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
- @@ -2045,8 +2045,7 @@
- void
- wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
- {
- - bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
- - __DATE__, __TIME__, EPI_VERSION_STR);
- + bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit, EPI_VERSION_STR);
- }
- #if defined(BCMDBG)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement