Update to build against 2.6.29 and for new location in source tree

5 files changed, 49 insertions, 49 deletions

diff --git a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/Makefile b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/Makefile
index 7eb02ee..dce3583 100644
--- a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/Makefile
+++ b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/Makefile
@@ -11,7 +11,7 @@ ifeq ($(CONFIG),)
 $(error CONFIG not set)
 endif
 
-all: driver tools
+all: driver
 
 include config.$(CONFIG).mk
 
diff --git a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/config.android-arm.mk b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/config.android-arm.mk
index 181f063..d97589e 100644
--- a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/config.android-arm.mk
+++ b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/config.android-arm.mk
@@ -1,8 +1,8 @@
 ARCH := arm
 TMP_DIR := $(PWD)
 SDIO_DRIVER := mmc
-KDIR := $(TMP_DIR)/../../../../../kernel
-CROSS_COMPILE := $(TMP_DIR)/../../../../../prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-
+KDIR := $(TMP_DIR)/../../../../../../../kernel
+CROSS_COMPILE := $(TMP_DIR)/../../../../../../../prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-
 EXTRA_DRV_CFLAGS := -DUNIFI_NET_NAME=\"wlan\" -DANDROID_BUILD
 export EXTRA_DRV_CFLAGS
 
diff --git a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/inet.c b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/inet.c
index bf165ad..d9554b8 100644
--- a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/inet.c
+++ b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/inet.c
@@ -34,7 +34,7 @@ static int unifi_inetaddr_event(struct notifier_block *notif, unsigned long even
     struct in_ifaddr *if_addr;
 
     ndev = ((struct in_ifaddr *)ifa)->ifa_dev->dev;
-    priv = ndev->priv;
+    priv = netdev_priv(ndev);
     if_addr = (struct in_ifaddr *)ifa;
 
     /* If this event is for a UniFi device, notify the SME that an IP
diff --git a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/netdev.c b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/netdev.c
index 8faa885..bfa0039 100644
--- a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/netdev.c
+++ b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/netdev.c
@@ -444,7 +444,7 @@ unifi_free_netdevice(unifi_priv_t *priv)
 static int
 unifi_net_open(struct net_device *dev)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 
     func_enter();
 
@@ -483,7 +483,7 @@ static int
 unifi_net_stop(struct net_device *dev)
 {
 #ifdef CSR_NATIVE_LINUX
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 #endif
 
     func_enter();
@@ -524,7 +524,7 @@ unifi_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 static struct net_device_stats *
 unifi_net_get_stats(struct net_device *dev)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 
     return &priv->stats;
 } /* unifi_net_get_stats() */
@@ -541,7 +541,7 @@ skb_ether_to_80211(struct net_device *dev, struct sk_buff *skb, int proto)
     if (proto < 0x600) {
         /* codes <= 1500 reserved for 802.3 lengths */
         /* it's 802.3, pass ether payload unchanged,  */
-        unifi_trace(dev->priv, UDBG3, "802.3 len: %d\n", skb->len);
+        unifi_trace(netdev_priv(dev), UDBG3, "802.3 len: %d\n", skb->len);
 
         /*   leave off any PAD octets.  */
         skb_trim(skb, proto);
@@ -566,7 +566,7 @@ skb_ether_to_80211(struct net_device *dev, struct sk_buff *skb, int proto)
 
     } else {
         /* it's DIXII, time for some conversion */
-        unifi_trace(dev->priv, UDBG3, "DIXII len: %d\n", skb->len);
+        unifi_trace(netdev_priv(dev), UDBG3, "DIXII len: %d\n", skb->len);
 
         /* tack on SNAP */
         snap = (llc_snap_hdr_t *)skb_push(skb, sizeof(llc_snap_hdr_t));
@@ -951,7 +951,7 @@ send_mlme_eapol_request(unifi_priv_t *priv, struct sk_buff *skb, const struct et
 static int
 unifi_net_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct ethhdr ehdr;
     int proto;
     int result;
@@ -1266,7 +1266,7 @@ unifi_rx(unifi_priv_t *priv, u8 *packed_signal, int signal_len,
 static void
 unifi_set_multicast_list(struct net_device *dev)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct dev_mc_list *p;      /* Pointer to the addresses structure. */
     int i;
     u8 *mc_list = priv->mc_list;
@@ -1455,9 +1455,9 @@ int uf_install_qdisc(struct net_device *dev)
 static int uf_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-    unifi_priv_t *priv = qd->dev_queue->dev->priv;
+    unifi_priv_t *priv = netdev_priv(qd->dev_queue->dev);
 #else
-    unifi_priv_t *priv = qd->dev->priv;
+    unifi_priv_t *priv = netdev_priv(qd->dev);
 #endif /* LINUX_VERSION_CODE */
     struct uf_sched_data *q = qdisc_priv(qd);
     struct uf_tx_packet_data *pkt_data = (struct uf_tx_packet_data *) skb->cb;
@@ -1498,9 +1498,9 @@ static int uf_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
 static int uf_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-    unifi_priv_t *priv = qd->dev_queue->dev->priv;
+    unifi_priv_t *priv = netdev_priv(qd->dev_queue->dev);
 #else
-    unifi_priv_t *priv = qd->dev->priv;
+    unifi_priv_t *priv = netdev_priv(qd->dev);
 #endif /* LINUX_VERSION_CODE */
     struct uf_sched_data *q = qdisc_priv(qd);
     struct uf_tx_packet_data *pkt_data = (struct uf_tx_packet_data *) skb->cb;
@@ -1647,10 +1647,10 @@ static int uf_qdiscop_init(struct Qdisc *qd, struct rtattr *opt)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
     struct net_device *dev = qd->dev_queue->dev;
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 #else
     struct net_device *dev = qd->dev;
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 #endif /* LINUX_VERSION_CODE */
     struct uf_sched_data *q = qdisc_priv(qd);
     int err = 0, i;
diff --git a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/sme_wext.c b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/sme_wext.c
index 10e0d34..7712272 100644
--- a/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/sme_wext.c
+++ b/unifi_hostsw_linux_147/unifi-linux/os_linux/driver/sme_wext.c
@@ -191,7 +191,7 @@ static int
 iwprivsdefs(struct net_device *dev, struct iw_request_info *info,
             union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int r;
     unifi_AppValue sme_app_value;
 
@@ -232,7 +232,7 @@ static int
 iwprivs80211ps(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int r = 0;
     int ps_mode = (int)(*extra);
     unifi_AppValue sme_app_value;
@@ -274,7 +274,7 @@ static int
 iwprivg80211ps(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     unifi_AppValue sme_app_value;
     int r;
 
@@ -322,7 +322,7 @@ static int
 iwprivssmedebugdump(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     if (priv->smepriv != NULL) {
 #ifdef CSR_SME_EMB
         fsm_debug_dump(priv->smepriv);
@@ -336,7 +336,7 @@ static int
 unifi_giwname(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     char *name = wrqu->name;
 
     if (priv->if_index == CSR_INDEX_5G) {
@@ -352,7 +352,7 @@ static int
 unifi_siwfreq(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_freq *freq = (struct iw_freq *)wrqu;
 
     func_enter();
@@ -376,7 +376,7 @@ static int
 unifi_giwfreq(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_freq *freq = (struct iw_freq *)wrqu;
     int err = 0;
     unifi_AppValue sme_app_value;
@@ -400,7 +400,7 @@ static int
 unifi_siwmode(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 
     func_enter();
 
@@ -433,7 +433,7 @@ static int
 unifi_giwmode(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int r = 0;
     unifi_AppValue sme_app_value;
 
@@ -561,7 +561,7 @@ static int
 unifi_siwap(struct net_device *dev, struct iw_request_info *info,
             union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int err = 0;
     const unsigned char zero_bssid[ETH_ALEN] = {0x00, 0x00, 0x00,
                                                 0x00, 0x00, 0x00};
@@ -620,7 +620,7 @@ static int
 unifi_giwap(struct net_device *dev, struct iw_request_info *info,
             union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     unifi_AppValue sme_app_value;
     int r = 0;
     uint8 *bssid;
@@ -654,7 +654,7 @@ static int
 unifi_siwscan(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int scantype;
     int r;
     unifi_SSID scan_ssid;
@@ -970,7 +970,7 @@ static int
 unifi_giwscan(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_point *dwrq = &wrqu->data;
     int r;
 
@@ -1016,7 +1016,7 @@ static int
 unifi_siwessid(struct net_device *dev, struct iw_request_info *info,
                struct iw_point *data, char *essid)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int len;
     int err = 0;
 
@@ -1063,7 +1063,7 @@ static int
 unifi_giwessid(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *essid)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_point *data = &wrqu->essid;
     unifi_AppValue sme_app_value;
     int r = 0;
@@ -1096,7 +1096,7 @@ static int
 unifi_siwrate(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_param *args = &wrqu->bitrate;
     unifi_AppValue sme_app_value;
     int r;
@@ -1152,7 +1152,7 @@ static int
 unifi_giwrate(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_param *args = &wrqu->bitrate;
     int r;
     int bitrate, flag;
@@ -1193,7 +1193,7 @@ static int
 unifi_siwrts(struct net_device *dev, struct iw_request_info *info,
              union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int val = wrqu->rts.value;
     int r = 0;
     unifi_AppValue sme_app_value;
@@ -1231,7 +1231,7 @@ static int
 unifi_giwrts(struct net_device *dev, struct iw_request_info *info,
              union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int r;
     int rts_thresh;
     unifi_AppValue sme_app_value;
@@ -1262,7 +1262,7 @@ static int
 unifi_siwfrag(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int val = wrqu->frag.value;
     int r = 0;
     unifi_AppValue sme_app_value;
@@ -1298,7 +1298,7 @@ static int
 unifi_giwfrag(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int r;
     int frag_thresh;
     unifi_AppValue sme_app_value;
@@ -1327,7 +1327,7 @@ static int
 unifi_siwencode(struct net_device *dev, struct iw_request_info *info,
                 union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_point *erq = &wrqu->encoding;
     int index;
     int rc = 0;
@@ -1488,7 +1488,7 @@ static int
 unifi_giwencode(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_point *erq = &wrqu->encoding;
 
     CHECK_INITED(priv);
@@ -1528,7 +1528,7 @@ unifi_siwpower(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
     struct iw_param *args = &wrqu->power;
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int listen_interval, wake_for_dtim;
     int r = 0;
     unifi_AppValue sme_app_value;
@@ -1605,7 +1605,7 @@ unifi_giwpower(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
     struct iw_param *args = &wrqu->power;
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     unifi_AppValue sme_app_value;
     int r;
 
@@ -1672,7 +1672,7 @@ static int
 unifi_siwmlme(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_mlme *mlme = (struct iw_mlme *)extra;
 
     CHECK_INITED(priv);
@@ -1718,7 +1718,7 @@ static int
 unifi_siwgenie(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     unifi_DataBlock *assoc_req_ie;
     int len;
 
@@ -1757,7 +1757,7 @@ static int
 unifi_giwgenie(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     int len;
 
     func_enter();
@@ -1800,7 +1800,7 @@ static int
 _unifi_siwauth(struct net_device *dev, struct iw_request_info *info,
               union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 
     func_enter();
 
@@ -2058,7 +2058,7 @@ static int
 _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info,
                    union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
     int r = 0;
     unsigned char *keydata;
@@ -2248,7 +2248,7 @@ static int
 unifi_siwpmksa(struct net_device *dev, struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
     struct iw_pmksa *pmksa = (struct iw_pmksa *)extra;
     unifi_Status r = 0;
     unifi_PmkidList pmkid_list;
@@ -2319,7 +2319,7 @@ unifi_siwpmksa(struct net_device *dev, struct iw_request_info *info,
 struct iw_statistics *
 unifi_get_wireless_stats(struct net_device *dev)
 {
-    unifi_priv_t *priv = dev->priv;
+    unifi_priv_t *priv = netdev_priv(dev);
 
     if (priv->init_progress != UNIFI_INIT_COMPLETED) {
         return NULL;