From af4aefb2f1df7bb752bc589830f29e8117320f45 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 26 Jun 2014 15:50:47 +0200 Subject: [PATCH] meta-digi-arm: kernel-module-atheros: Update SRC_URI. This updates the driver to upstream AR6003-ISC-v3.4p6-b3.4.0.225. https://jira.digi.com/browse/DEL-1127 Signed-off-by: Alex Gonzalez --- .../kernel-module-atheros.bb | 4 +- .../0001-atheros-convert-NLA_PUT-macros.patch | 66 +++++++++---------- ...theros-update-renamed-struct-members.patch | 26 ++++---- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb index cd512b55b..f28604a7a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb @@ -12,8 +12,8 @@ PR = "r1" # from busybox does not support '--ignore-install' option. RDEPENDS_${PN} = "kmod" -SRCREV_external = "621b43aef3f4611500c461ef8940fa7990d55d9e" -SRCREV_internal = "fdb797adf47514f5c94921fb20e64b4ecadb7a52" +SRCREV_external = "" +SRCREV_internal = "50dafb5890180cf33fdb42919c3e6f591d0cd2ea" SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git;nobranch=1" diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0001-atheros-convert-NLA_PUT-macros.patch b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0001-atheros-convert-NLA_PUT-macros.patch index 109a51296..331f62c78 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0001-atheros-convert-NLA_PUT-macros.patch +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0001-atheros-convert-NLA_PUT-macros.patch @@ -56,7 +56,7 @@ index bb60ed23a967..450f915b9f96 100644 return; diff --git a/compat-wireless/net/wireless/nl80211.c b/compat-wireless/net/wireless/nl80211.c -index 896d19bb113e..62e89a1b8b4c 100644 +index 66d35f2ca879..c219a2ca027f 100644 --- a/compat-wireless/net/wireless/nl80211.c +++ b/compat-wireless/net/wireless/nl80211.c @@ -363,20 +363,26 @@ static inline void *nl80211hdr_put(struct sk_buff *skb, u32 pid, u32 seq, @@ -1119,7 +1119,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, infoattr); -@@ -4899,7 +5065,8 @@ __cfg80211_testmode_alloc_skb(struct cfg80211_registered_device *rdev, +@@ -4900,7 +5066,8 @@ __cfg80211_testmode_alloc_skb(struct cfg80211_registered_device *rdev, return NULL; } @@ -1129,7 +1129,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 data = nla_nest_start(skb, NL80211_ATTR_TESTDATA); ((void **)skb->cb)[0] = rdev; -@@ -5263,7 +5430,8 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, +@@ -5274,7 +5441,8 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, if (err) goto free_msg; @@ -1139,7 +1139,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -5547,7 +5715,8 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info) +@@ -5558,7 +5726,8 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info) goto free_msg; if (msg) { @@ -1149,7 +1149,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); return genlmsg_reply(msg, info); -@@ -5652,7 +5821,8 @@ static int nl80211_get_power_save(struct sk_buff *skb, struct genl_info *info) +@@ -5663,7 +5832,8 @@ static int nl80211_get_power_save(struct sk_buff *skb, struct genl_info *info) else ps_state = NL80211_PS_DISABLED; @@ -1159,7 +1159,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); return genlmsg_reply(msg, info); -@@ -5830,19 +6000,26 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) +@@ -5841,19 +6011,26 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) goto nla_put_failure; if (rdev->wowlan->any) @@ -1193,7 +1193,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 if (rdev->wowlan->n_patterns) { struct nlattr *nl_pats, *nl_pat; int i, pat_len; -@@ -5857,12 +6034,14 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) +@@ -5868,12 +6045,14 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) if (!nl_pat) goto nla_put_failure; pat_len = rdev->wowlan->patterns[i].pattern_len; @@ -1212,7 +1212,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, nl_pat); } nla_nest_end(msg, nl_pats); -@@ -6135,7 +6314,8 @@ static int nl80211_probe_client(struct sk_buff *skb, +@@ -6146,7 +6325,8 @@ static int nl80211_probe_client(struct sk_buff *skb, if (err) goto free_msg; @@ -1222,7 +1222,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -6832,18 +7012,21 @@ static int nl80211_add_scan_req(struct sk_buff *msg, +@@ -6843,18 +7023,21 @@ static int nl80211_add_scan_req(struct sk_buff *msg, if (!nest) goto nla_put_failure; for (i = 0; i < req->n_ssids; i++) @@ -1247,7 +1247,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 return 0; nla_put_failure: -@@ -6862,8 +7045,10 @@ static int nl80211_send_scan_msg(struct sk_buff *msg, +@@ -6873,8 +7056,10 @@ static int nl80211_send_scan_msg(struct sk_buff *msg, if (!hdr) return -1; @@ -1260,7 +1260,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 /* ignore errors and send incomplete event anyway */ nl80211_add_scan_req(msg, rdev); -@@ -6887,8 +7072,10 @@ nl80211_send_sched_scan_msg(struct sk_buff *msg, +@@ -6898,8 +7083,10 @@ nl80211_send_sched_scan_msg(struct sk_buff *msg, if (!hdr) return -1; @@ -1273,7 +1273,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 return genlmsg_end(msg, hdr); -@@ -7011,26 +7198,33 @@ void nl80211_send_reg_change_event(struct regulatory_request *request) +@@ -7022,26 +7209,33 @@ void nl80211_send_reg_change_event(struct regulatory_request *request) } /* Userspace can always count this one always being set */ @@ -1318,7 +1318,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7064,9 +7258,12 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, +@@ -7075,9 +7269,12 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, return; } @@ -1334,7 +1334,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7144,10 +7341,14 @@ static void nl80211_send_mlme_timeout(struct cfg80211_registered_device *rdev, +@@ -7155,10 +7352,14 @@ static void nl80211_send_mlme_timeout(struct cfg80211_registered_device *rdev, return; } @@ -1353,7 +1353,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7195,15 +7396,21 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, +@@ -7206,15 +7407,21 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, return; } @@ -1381,7 +1381,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7235,13 +7442,18 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev, +@@ -7246,13 +7453,18 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev, return; } @@ -1405,7 +1405,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7272,14 +7484,19 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, +@@ -7283,14 +7495,19 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, return; } @@ -1430,7 +1430,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7310,9 +7527,12 @@ void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev, +@@ -7321,9 +7538,12 @@ void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev, return; } @@ -1446,7 +1446,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7343,11 +7563,15 @@ void nl80211_send_new_peer_candidate(struct cfg80211_registered_device *rdev, +@@ -7354,11 +7574,15 @@ void nl80211_send_new_peer_candidate(struct cfg80211_registered_device *rdev, return; } @@ -1466,7 +1466,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7378,15 +7602,21 @@ void nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev, +@@ -7389,15 +7613,21 @@ void nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev, return; } @@ -1494,7 +1494,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7421,7 +7651,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy, +@@ -7432,7 +7662,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy, * Since we are applying the beacon hint to a wiphy we know its * wiphy_idx is valid */ @@ -1504,7 +1504,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 /* Before */ nl_freq = nla_nest_start(msg, NL80211_ATTR_FREQ_BEFORE); -@@ -7473,14 +7704,20 @@ static void nl80211_send_remain_on_chan_event( +@@ -7484,14 +7715,20 @@ static void nl80211_send_remain_on_chan_event( return; } @@ -1531,7 +1531,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7550,8 +7787,10 @@ void nl80211_send_sta_del_event(struct cfg80211_registered_device *rdev, +@@ -7561,8 +7798,10 @@ void nl80211_send_sta_del_event(struct cfg80211_registered_device *rdev, return; } @@ -1544,7 +1544,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7621,9 +7860,12 @@ static bool __nl80211_unexpected_frame(struct net_device *dev, u8 cmd, +@@ -7632,9 +7871,12 @@ static bool __nl80211_unexpected_frame(struct net_device *dev, u8 cmd, return true; } @@ -1560,7 +1560,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 err = genlmsg_end(msg, hdr); if (err < 0) { -@@ -7671,10 +7913,14 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, +@@ -7682,10 +7924,14 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, return -ENOMEM; } @@ -1579,7 +1579,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7704,12 +7950,17 @@ void nl80211_send_mgmt_tx_status(struct cfg80211_registered_device *rdev, +@@ -7715,12 +7961,17 @@ void nl80211_send_mgmt_tx_status(struct cfg80211_registered_device *rdev, return; } @@ -1602,7 +1602,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7741,15 +7992,18 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev, +@@ -7752,15 +8003,18 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev, return; } @@ -1625,7 +1625,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, pinfoattr); -@@ -7782,16 +8036,20 @@ void nl80211_gtk_rekey_notify(struct cfg80211_registered_device *rdev, +@@ -7793,16 +8047,20 @@ void nl80211_gtk_rekey_notify(struct cfg80211_registered_device *rdev, return; } @@ -1651,7 +1651,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, rekey_attr); -@@ -7824,17 +8082,22 @@ void nl80211_pmksa_candidate_notify(struct cfg80211_registered_device *rdev, +@@ -7835,17 +8093,22 @@ void nl80211_pmksa_candidate_notify(struct cfg80211_registered_device *rdev, return; } @@ -1679,7 +1679,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, attr); -@@ -7866,9 +8129,12 @@ void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev, +@@ -7877,9 +8140,12 @@ void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev, return; } @@ -1695,7 +1695,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 genlmsg_end(msg, hdr); -@@ -7950,15 +8216,19 @@ nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev, +@@ -7961,15 +8227,19 @@ nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev, return; } @@ -1719,7 +1719,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 nla_nest_end(msg, pinfoattr); -@@ -7992,12 +8262,17 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr, +@@ -8003,12 +8273,17 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr, return; } @@ -1742,7 +1742,7 @@ index 896d19bb113e..62e89a1b8b4c 100644 err = genlmsg_end(msg, hdr); if (err < 0) { -@@ -8037,10 +8312,13 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy, +@@ -8048,10 +8323,13 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy, return; } diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0002-atheros-update-renamed-struct-members.patch b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0002-atheros-update-renamed-struct-members.patch index 93e0636f3..767bca0cf 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0002-atheros-update-renamed-struct-members.patch +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/0002-atheros-update-renamed-struct-members.patch @@ -8,11 +8,11 @@ struct netlink_skb_parms: s/pid/portid Signed-off-by: Javier Viguera --- - compat-wireless/net/wireless/nl80211.c | 50 +++++++++++++++++----------------- + 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 +index c219a2ca027f..2cba63866a90 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) @@ -132,7 +132,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 cb->nlh->nlmsg_seq, NLM_F_MULTI, netdev, &survey) < 0) -@@ -5009,7 +5009,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb, +@@ -5010,7 +5010,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb, } while (1) { @@ -141,7 +141,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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, +@@ -5090,7 +5090,7 @@ struct sk_buff *cfg80211_testmode_alloc_reply_skb(struct wiphy *wiphy, return NULL; return __cfg80211_testmode_alloc_skb(rdev, approxlen, @@ -150,7 +150,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 rdev->testmode_info->snd_seq, GFP_KERNEL); } -@@ -5416,7 +5416,7 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, +@@ -5427,7 +5427,7 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, if (!msg) return -ENOMEM; @@ -159,7 +159,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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) +@@ -5638,7 +5638,7 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) if (!rdev->ops->mgmt_tx) return -EOPNOTSUPP; @@ -168,7 +168,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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) +@@ -5708,7 +5708,7 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info) if (!msg) return -ENOMEM; @@ -177,7 +177,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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) +@@ -5820,7 +5820,7 @@ static int nl80211_get_power_save(struct sk_buff *skb, struct genl_info *info) if (!msg) return -ENOMEM; @@ -186,7 +186,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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) +@@ -5998,7 +5998,7 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) if (!msg) return -ENOMEM; @@ -195,7 +195,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 NL80211_CMD_GET_WOWLAN); if (!hdr) goto nla_put_failure; -@@ -6270,7 +6270,7 @@ static int nl80211_register_unexpected_frame(struct sk_buff *skb, +@@ -6281,7 +6281,7 @@ static int nl80211_register_unexpected_frame(struct sk_buff *skb, if (wdev->ap_unexpected_nlpid) return -EBUSY; @@ -204,7 +204,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 return 0; } -@@ -6300,7 +6300,7 @@ static int nl80211_probe_client(struct sk_buff *skb, +@@ -6311,7 +6311,7 @@ static int nl80211_probe_client(struct sk_buff *skb, if (!msg) return -ENOMEM; @@ -213,7 +213,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 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) +@@ -6349,7 +6349,7 @@ static int nl80211_register_beacons(struct sk_buff *skb, struct genl_info *info) if (rdev->ap_beacons_nlpid) return -EBUSY; @@ -222,7 +222,7 @@ index 62e89a1b8b4c..2b929c0557a3 100644 return 0; } -@@ -8346,8 +8346,8 @@ static int nl80211_netlink_notify(struct notifier_block * nb, +@@ -8357,8 +8357,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)