kernel-module-atheros: revert to version v3.4p4 of the driver

Version v3.4p6 seems to have some problems with WEP encription. Version
v3.4p4 seems to work better with WEP, so revert to that version.

https://jira.digi.com/browse/DEL-843

Signed-off-by: Javier Viguera <javier.viguera@digi.com>

meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb

@@ -13,7 +13,7 @@ PR = "r1"
 RDEPENDS_${PN} = "kmod"
 
 SRCREV_external = ""
-SRCREV_internal = "${@base_conditional('IS_KERNEL_2X', '1' , 'f18d0de2ee85b6e768bd7c9b4685efdc0240fd4b', 'b17616e7d69cfc6f838daa5477403d9e9c4bc997', d)}"
+SRCREV_internal = "15bae2c4e330ea6d9289217d3c38ebf63aa8ff15"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git"
@@ -22,6 +22,8 @@ SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}'
 SRC_URI += " \
     file://atheros \
     file://Makefile \
+    ${@base_conditional('IS_KERNEL_2X', '1' , '', 'file://0001-atheros-convert-NLA_PUT-macros.patch', d)} \
+    ${@base_conditional('IS_KERNEL_2X', '1' , '', 'file://0002-atheros-update-renamed-struct-members.patch', d)} \
 "
 
 S = "${WORKDIR}/git"
@@ -32,10 +34,6 @@ do_configure_prepend() {
 	cp ${WORKDIR}/Makefile ${S}/
 }
 
-do_configure_prepend_ccardimx28js() {
-	sed -i '/^CONFIG_SUPPORT_11W=y/s,^,# ,g' ${S}/compat-wireless/config.mk
-}
-
 do_install_append() {
 	install -d ${D}${sysconfdir}/network/if-pre-up.d
 	install -m 0755 ${WORKDIR}/atheros ${D}${sysconfdir}/network/if-pre-up.d/

meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0002-atheros-update-renamed-struct-members.patch

@@ -0,0 +1,235 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Fri, 13 Sep 2013 11:12:04 +0200
+Subject: [PATCH] atheros: update renamed struct members
+
+struct genl_info:         s/snd_pid/snd_portid
+struct netlink_notify:    s/pid/portid
+struct netlink_skb_parms: s/pid/portid
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ compat-wireless/net/wireless/nl80211.c | 50 +++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/compat-wireless/net/wireless/nl80211.c b/compat-wireless/net/wireless/nl80211.c
+index 62e89a1b8b4c..2b929c0557a3 100644
+--- a/compat-wireless/net/wireless/nl80211.c
++++ b/compat-wireless/net/wireless/nl80211.c
+@@ -1122,7 +1122,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
+ 			continue;
+ 		if (++idx <= start)
+ 			continue;
+-		if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).pid,
++		if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).portid,
+ 				       cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 				       dev) < 0) {
+ 			idx--;
+@@ -1145,7 +1145,7 @@ static int nl80211_get_wiphy(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	if (nl80211_send_wiphy(msg, info->snd_pid, info->snd_seq, 0, dev) < 0) {
++	if (nl80211_send_wiphy(msg, info->snd_portid, info->snd_seq, 0, dev) < 0) {
+ 		nlmsg_free(msg);
+ 		return -ENOBUFS;
+ 	}
+@@ -1590,7 +1590,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback *
+ 				if_idx++;
+ 				continue;
+ 			}
+-			if (nl80211_send_iface(skb, NETLINK_CB(cb->skb).pid,
++			if (nl80211_send_iface(skb, NETLINK_CB(cb->skb).portid,
+ 					       cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 					       rdev, wdev->netdev) < 0) {
+ 				mutex_unlock(&rdev->devlist_mtx);
+@@ -1621,7 +1621,7 @@ static int nl80211_get_interface(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	if (nl80211_send_iface(msg, info->snd_pid, info->snd_seq, 0,
++	if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0,
+ 			       dev, netdev) < 0) {
+ 		nlmsg_free(msg);
+ 		return -ENOBUFS;
+@@ -1922,7 +1922,7 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_NEW_KEY);
+ 	if (IS_ERR(hdr))
+ 		return PTR_ERR(hdr);
+@@ -2628,7 +2628,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
+ 			goto out_err;
+ 
+ 		if (nl80211_send_station(skb,
+-				NETLINK_CB(cb->skb).pid,
++				NETLINK_CB(cb->skb).portid,
+ 				cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 				netdev, mac_addr,
+ 				&sinfo) < 0)
+@@ -2674,7 +2674,7 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	if (nl80211_send_station(msg, info->snd_pid, info->snd_seq, 0,
++	if (nl80211_send_station(msg, info->snd_portid, info->snd_seq, 0,
+ 				 dev, mac_addr, &sinfo) < 0) {
+ 		nlmsg_free(msg);
+ 		return -ENOBUFS;
+@@ -3062,7 +3062,7 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
+ 		if (err)
+ 			goto out_err;
+ 
+-		if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).pid,
++		if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).portid,
+ 				       cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 				       netdev, dst, next_hop,
+ 				       &pinfo) < 0)
+@@ -3111,7 +3111,7 @@ static int nl80211_get_mpath(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	if (nl80211_send_mpath(msg, info->snd_pid, info->snd_seq, 0,
++	if (nl80211_send_mpath(msg, info->snd_portid, info->snd_seq, 0,
+ 				 dev, dst, next_hop, &pinfo) < 0) {
+ 		nlmsg_free(msg);
+ 		return -ENOBUFS;
+@@ -3337,7 +3337,7 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
+ 	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ 	if (!msg)
+ 		return -ENOMEM;
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_GET_MESH_CONFIG);
+ 	if (!hdr)
+ 		goto out;
+@@ -3612,7 +3612,7 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
+ 		goto out;
+ 	}
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_GET_REG);
+ 	if (!hdr)
+ 		goto put_failure;
+@@ -4216,7 +4216,7 @@ static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,
+ 
+ 	ASSERT_WDEV_LOCK(wdev);
+ 
+-	hdr = nl80211hdr_put(msg, NETLINK_CB(cb->skb).pid, seq, flags,
++	hdr = nl80211hdr_put(msg, NETLINK_CB(cb->skb).portid, seq, flags,
+ 			     NL80211_CMD_NEW_SCAN_RESULTS);
+ 	if (!hdr)
+ 		return -1;
+@@ -4451,7 +4451,7 @@ static int nl80211_dump_survey(struct sk_buff *skb,
+ 		}
+ 
+ 		if (nl80211_send_survey(skb,
+-				NETLINK_CB(cb->skb).pid,
++				NETLINK_CB(cb->skb).portid,
+ 				cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 				netdev,
+ 				&survey) < 0)
+@@ -5009,7 +5009,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
+ 	}
+ 
+ 	while (1) {
+-		void *hdr = nl80211hdr_put(skb, NETLINK_CB(cb->skb).pid,
++		void *hdr = nl80211hdr_put(skb, NETLINK_CB(cb->skb).portid,
+ 					   cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 					   NL80211_CMD_TESTMODE);
+ 		struct nlattr *tmdata;
+@@ -5089,7 +5089,7 @@ struct sk_buff *cfg80211_testmode_alloc_reply_skb(struct wiphy *wiphy,
+ 		return NULL;
+ 
+ 	return __cfg80211_testmode_alloc_skb(rdev, approxlen,
+-				rdev->testmode_info->snd_pid,
++				rdev->testmode_info->snd_portid,
+ 				rdev->testmode_info->snd_seq,
+ 				GFP_KERNEL);
+ }
+@@ -5416,7 +5416,7 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_REMAIN_ON_CHANNEL);
+ 
+ 	if (IS_ERR(hdr)) {
+@@ -5627,7 +5627,7 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info)
+ 	if (!rdev->ops->mgmt_tx)
+ 		return -EOPNOTSUPP;
+ 
+-	return cfg80211_mlme_register_mgmt(dev->ieee80211_ptr, info->snd_pid,
++	return cfg80211_mlme_register_mgmt(dev->ieee80211_ptr, info->snd_portid,
+ 			frame_type,
+ 			nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
+ 			nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
+@@ -5697,7 +5697,7 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
+ 		if (!msg)
+ 			return -ENOMEM;
+ 
+-		hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++		hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 				     NL80211_CMD_FRAME);
+ 
+ 		if (IS_ERR(hdr)) {
+@@ -5809,7 +5809,7 @@ static int nl80211_get_power_save(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_GET_POWER_SAVE);
+ 	if (!hdr) {
+ 		err = -ENOBUFS;
+@@ -5987,7 +5987,7 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info)
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_GET_WOWLAN);
+ 	if (!hdr)
+ 		goto nla_put_failure;
+@@ -6270,7 +6270,7 @@ static int nl80211_register_unexpected_frame(struct sk_buff *skb,
+ 	if (wdev->ap_unexpected_nlpid)
+ 		return -EBUSY;
+ 
+-	wdev->ap_unexpected_nlpid = info->snd_pid;
++	wdev->ap_unexpected_nlpid = info->snd_portid;
+ 	return 0;
+ }
+ 
+@@ -6300,7 +6300,7 @@ static int nl80211_probe_client(struct sk_buff *skb,
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
+-	hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
++	hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ 			     NL80211_CMD_PROBE_CLIENT);
+ 
+ 	if (IS_ERR(hdr)) {
+@@ -6338,7 +6338,7 @@ static int nl80211_register_beacons(struct sk_buff *skb, struct genl_info *info)
+ 	if (rdev->ap_beacons_nlpid)
+ 		return -EBUSY;
+ 
+-	rdev->ap_beacons_nlpid = info->snd_pid;
++	rdev->ap_beacons_nlpid = info->snd_portid;
+ 
+ 	return 0;
+ }
+@@ -8346,8 +8346,8 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
+ 
+ 	list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
+ 		list_for_each_entry_rcu(wdev, &rdev->netdev_list, list)
+-			cfg80211_mlme_unregister_socket(wdev, notify->pid);
+-		if (rdev->ap_beacons_nlpid == notify->pid)
++			cfg80211_mlme_unregister_socket(wdev, notify->portid);
++		if (rdev->ap_beacons_nlpid == notify->portid)
+ 			rdev->ap_beacons_nlpid = 0;
+ 	}
+