- fix prep and rediff patches

[packages/wl.git] / linux-4.12.patch

diff --git a/linux-4.12.patch b/linux-4.12.patch
index 8abc73db4db119ff9b99954678fcf33ccf057e65..61aa293522998f324012e5f638352a1211152f84 100644 (file)
--- a/linux-4.12.patch
+++ b/linux-4.12.patch
@@ -1,8 +1,7 @@
-diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
-index da36405..d3741eb 100644
---- a/src/wl/sys/wl_cfg80211_hybrid.c
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c
-@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
+diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c
+--- wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c        2021-02-25 20:01:38.124327695 +0100
++++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c    2021-02-25 20:01:38.250994664 +0100
+@@ -60,7 +60,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
  #endif
  
  static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
@@ -14,7 +13,7 @@ index da36405..d3741eb 100644
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
  static s32
  wl_cfg80211_scan(struct wiphy *wiphy,
-@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+@@ -473,7 +477,11 @@ wl_dev_ioctl(struct net_device *dev, u32
  
  static s32
  wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
@@ -26,7 +25,7 @@ index da36405..d3741eb 100644
     struct vif_params *params)
  {
        struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
-@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+@@ -2394,6 +2402,20 @@ wl_bss_roaming_done(struct wl_cfg80211_p
                      const wl_event_msg_t *e, void *data)
  {
        struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
@@ -46,10 +45,10 @@ index da36405..d3741eb 100644
 +#endif
        s32 err = 0;
  
-       wl_get_assoc_ies(wl);
-@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
-       memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
-       wl_update_bss_info(wl);
+       err = wl_get_assoc_ies(wl);
+@@ -2408,12 +2430,17 @@ wl_bss_roaming_done(struct wl_cfg80211_p
+               return err;
+ 
        cfg80211_roamed(ndev,
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 +                      &roam_info,