P#108132 fix p200 wifi_driect connect fail issue

Change-Id: I84e08d73bb3057d37c6d1c806221cb56a73ea5d8

diff --git a/bcmdhd_1_201_59_x/wl_cfg80211.c b/bcmdhd_1_201_59_x/wl_cfg80211.c
index 70cbacdceed579cfe0f66e94a21b66ceadb78acb..d941fec4af13b9d182c90a16ed8a6d52f5f39c1b 100644 (file)
--- a/bcmdhd_1_201_59_x/wl_cfg80211.c
+++ b/bcmdhd_1_201_59_x/wl_cfg80211.c
@@ -10943,9 +10943,13 @@ static void wl_scan_timeout(unsigned long data)
 static s32
 wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
        unsigned long state,
-       void *ndev)
+       void *ptr)
 {
-       struct net_device *dev = ndev;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
+       struct net_device *dev = ptr;
+#else
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+#endif
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct bcm_cfg80211 *cfg = g_bcm_cfg;
 
@@ -10993,7 +10997,7 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
 
                case NETDEV_UNREGISTER:
                        /* after calling list_del_rcu(&wdev->list) */
-                       wl_dealloc_netinfo(cfg, ndev);
+                       wl_dealloc_netinfo(cfg, dev);
                        break;
                case NETDEV_GOING_DOWN:
                        /* At NETDEV_DOWN state, wdev_cleanup_work work will be called.

diff --git a/broadcm_4354/wl_cfg80211.c b/broadcm_4354/wl_cfg80211.c
old mode 100755 (executable)
new mode 100644 (file)
index 4ea389e..109a88b
--- a/broadcm_4354/wl_cfg80211.c
+++ b/broadcm_4354/wl_cfg80211.c
@@ -10464,9 +10464,13 @@ static void wl_scan_timeout(unsigned long data)
 static s32
 wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
        unsigned long state,
-       void *ndev)
+       void *ptr)
 {
-       struct net_device *dev = ndev;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
+       struct net_device *dev = ptr;
+#else
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+#endif
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct bcm_cfg80211 *cfg = g_bcm_cfg;
 
@@ -10514,7 +10518,7 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
 
                case NETDEV_UNREGISTER:
                        /* after calling list_del_rcu(&wdev->list) */
-                       wl_dealloc_netinfo(cfg, ndev);
+                       wl_dealloc_netinfo(cfg, dev);
                        break;
                case NETDEV_GOING_DOWN:
                        /* At NETDEV_DOWN state, wdev_cleanup_work work will be called.