From: "Coelho, Luciano" <luciano.coelho@intel.com>
To: "kvalo@codeaurora.org" <kvalo@codeaurora.org>,
"davem@davemloft.net" <davem@davemloft.net>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
Subject: Re: pull-request: wireless-drivers-next 2016-05-13
Date: Mon, 16 May 2016 18:11:47 +0000 [thread overview]
Message-ID: <1463422307.25219.107.camel@intel.com> (raw)
In-Reply-To: <87futi858q.fsf@kamboji.qca.qualcomm.com>
T24gTW9uLCAyMDE2LTA1LTE2IGF0IDE3OjA4ICswMzAwLCBLYWxsZSBWYWxvIHdyb3RlOg0KPiBL
YWxsZSBWYWxvIDxrdmFsb0Bjb2RlYXVyb3JhLm9yZz4gd3JpdGVzOg0KPiANCj4gPiANCj4gPiBL
YWxsZSBWYWxvIDxrdmFsb0Bjb2RlYXVyb3JhLm9yZz4gd3JpdGVzOg0KPiA+IA0KPiA+ID4gDQo+
ID4gPiBUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29tbWl0DQo+ID4gPiBlZGUwMGE1Y2Vi
NGQ5MDNhOGMxMzdhNTJiYjc3ZDU3NGJhYWVmOGJkOg0KPiA+ID4gDQo+ID4gPiDCoCBNZXJnZSB0
YWcgJ3dpcmVsZXNzLWRyaXZlcnMtbmV4dC1mb3ItZGF2ZW0tMjAxNi0wNS0wMicgb2YNCj4gPiA+
IGdpdDovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9rdmFsby93aXJl
bGVzcy0NCj4gPiA+IGRyaXZlcnMtbmV4dCAoMjAxNi0wNS0wMyAwMDozNToxNiAtMDQwMCkNCj4g
PiA+IA0KPiA+ID4gYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6DQo+ID4g
PiANCj4gPiA+IA0KPiA+ID4gwqAgZ2l0Oi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9r
ZXJuZWwvZ2l0L2t2YWxvL3dpcmVsZXNzLQ0KPiA+ID4gZHJpdmVycy1uZXh0LmdpdCB0YWdzL3dp
cmVsZXNzLWRyaXZlcnMtbmV4dC1mb3ItZGF2ZW0tMjAxNi0wNS0xMw0KPiA+IFBsZWFzZSBkb24n
dCBwdWxsIHRoaXMgeWV0LCB0aGVyZSBtaWdodCBiZSBzb21ldGhpbmcgd3Jvbmcgbm93IHdpdGgN
Cj4gPiBtZXJnZXMgYW5kIG5lZWQgdG8gY2hlY2sgdGhhdCBmaXJzdC4NCj4gT2ssIGxpa2UgZGlz
Y3Vzc2VkIGluIHRocmVhZCAibGludXgtbmV4dDogbWFudWFsIG1lcmdlIG9mIHRoZQ0KPiB3aXJl
bGVzcy1kcml2ZXJzLW5leHQgdHJlZSB3aXRoIHRoZSBuZXQtbmV4dCB0cmVlIiB0aGVyZSBzZWVt
cyB0byBiZQ0KPiBhDQo+IHByb2JsZW0gb24gbmV0LW5leHQgaW4gZnVuY3Rpb24gaXdsX212bV9z
ZXRfdHhfY21kKCkuIEhlcmUgaXMgaG93IEkNCj4gcHJvcG9zZSB0byBmaXggdGhpcy4NCj4gDQo+
IFdoZW4gcHVsbGluZyB0aGUgdGFnIGFib3ZlIHlvdSBzaG91bGQgZ2V0IGEgY29uZmxpY3QgbGlr
ZSB0aGlzOg0KPiANCj4gZGlmZiAtLWNjIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdp
ZmkvbXZtL3R4LmMNCj4gaW5kZXggODgwMjEwOTE3YTZmLDc3OWJhZmNiYzlhMS4uMDAwMDAwMDAw
MDAwDQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMN
Cj4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vdHguYw0KPiBA
QEAgLTI5NCw3IC0yOTUsNyArMjk0LDExIEBAQCB2b2lkIGl3bF9tdm1fc2V0X3R4X2NtZChzdHJ1
Y3QgaXdsX212bcKgDQo+IMKgwqDCoMKgwqDCoMKgwqB0eF9jbWQtPnR4X2ZsYWdzID0gY3B1X3Rv
X2xlMzIodHhfZmxhZ3MpOw0KPiDCoMKgwqDCoMKgwqDCoMKgLyogVG90YWwgIyBieXRlcyB0byBi
ZSB0cmFuc21pdHRlZCAqLw0KPiDCoMKgwqDCoMKgwqDCoMKgdHhfY21kLT5sZW4gPSBjcHVfdG9f
bGUxNigodTE2KXNrYi0+bGVuICsNCj4gKys8PDw8PDw8IEhFQUQNCj4gwqArwqDCoMKgwqDCoMKg
wqDCoMKgwqDCoMKgwqDCoCh1aW50cHRyX3QpaW5mby0+ZHJpdmVyX2RhdGFbMF0pOw0KPiArKz09
PT09PT0NCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCh1aW50cHRyX3Qpc2tiX2lu
Zm8tPmRyaXZlcl9kYXRhWzBdKTsNCj4gKys+Pj4+Pj4+IG1hc3Rlcg0KPiDCoMKgwqDCoMKgwqDC
oMKgdHhfY21kLT5saWZlX3RpbWUgPSBjcHVfdG9fbGUzMihUWF9DTURfTElGRV9USU1FX0lORklO
SVRFKTsNCj4gwqDCoMKgwqDCoMKgwqDCoHR4X2NtZC0+c3RhX2lkID0gc3RhX2lkOw0KPiANCj4g
UGljayB0aGUgbGF0dGVyIHdpdGggc2tiX2luZm8gYW5kIHRoZW4gYWRkIHNrYl9pbmZvIHRvIHRo
ZSBiZWdpbm5pbmcNCj4gb2YNCj4gdGhlIHNhbWUgZnVuY3Rpb24uIFNvIHRoZSBmdW5jdGlvbiBz
aG91bGQgYmU6DQo+IA0KPiB2b2lkIGl3bF9tdm1fc2V0X3R4X2NtZChzdHJ1Y3QgaXdsX212bSAq
bXZtLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiLA0KPiAJCQlzdHJ1Y3QgaXdsX3R4X2NtZCAqdHhfY21k
LA0KPiAJCQlzdHJ1Y3QgaWVlZTgwMjExX3R4X2luZm8gKmluZm8sIHU4IHN0YV9pZCkNCj4gew0K
PiAJc3RydWN0IGllZWU4MDIxMV90eF9pbmZvICpza2JfaW5mbyA9IElFRUU4MDIxMV9TS0JfQ0Io
c2tiKTsNCj4gCXN0cnVjdCBpZWVlODAyMTFfaGRyICpoZHIgPSAodm9pZCAqKXNrYi0+ZGF0YTsN
Cj4gCV9fbGUxNiBmYyA9IGhkci0+ZnJhbWVfY29udHJvbDsNCj4gCXUzMiB0eF9mbGFncyA9IGxl
MzJfdG9fY3B1KHR4X2NtZC0+dHhfZmxhZ3MpOw0KPiAJdTMyIGxlbiA9IHNrYi0+bGVuICsgRkNT
X0xFTjsNCj4gCXU4IGFjOw0KPiANCj4gWy4uLl0NCj4gDQo+IAl0eF9jbWQtPnR4X2ZsYWdzID0g
Y3B1X3RvX2xlMzIodHhfZmxhZ3MpOw0KPiAJLyogVG90YWwgIyBieXRlcyB0byBiZSB0cmFuc21p
dHRlZCAqLw0KPiAJdHhfY21kLT5sZW4gPSBjcHVfdG9fbGUxNigodTE2KXNrYi0+bGVuICsNCj4g
CQkodWludHB0cl90KXNrYl9pbmZvLT5kcml2ZXJfZGF0YVswXSk7DQo+IAl0eF9jbWQtPmxpZmVf
dGltZSA9IGNwdV90b19sZTMyKFRYX0NNRF9MSUZFX1RJTUVfSU5GSU5JVEUpOw0KPiAJdHhfY21k
LT5zdGFfaWQgPSBzdGFfaWQ7DQo+IA0KPiBTb3JyeSBhYm91dCB0aGUgaGFzc2xlIGFuZCBwbGVh
c2UgbGV0IG1lIGtub3cgaWYgeW91IGhhdmUgYW55DQo+IHByb2JsZW1zLg0KPiBBZGRpbmcgTHVj
YSBhbmQgRW1tYW51ZWwganVzdCBpbiBjYXNlIEkgbWlzc2VkIHNvbWV0aGluZy4NCg0KQUNLLiDC
oFRoaXMgbG9va3MgY29ycmVjdC4gwqBJIGp1c3QgZGlmZmVkIHRoZSBpd2x3aWZpLW5leHQuZ2l0
IHRyZWUgKGF0DQpjb21taXQgYTUyNWQwZWFiMTdkIC0tIHdoaWNoIGlzIHdoZXJlIEkgbWVyZ2Ug
aXdsd2lmaS1maXhlcyBpbnRvDQppd2x3aWZpLW5leHQpIHdpdGggbmV0LW5leHQuZ2l0IG1hc3Rl
ciBhbmQgdGhlIGRpZmZlcmVuY2UgWzFdwqBpcw0KZXhhY3RseSB3aGF0IHlvdSBwcm9wb3NlZCB0
byBmaXguDQoNClsxXcKgaHR0cDovL3Bhc3RlYmluLmNvZWxoby5maS8xYjY5MDdjZGI5YTI1NDEz
LnR4dA0KDQotLQ0KQ2hlZXJzLA0KTHVjYS4=
WARNING: multiple messages have this Message-ID (diff)
From: "Coelho, Luciano" <luciano.coelho@intel.com>
To: "kvalo@codeaurora.org" <kvalo@codeaurora.org>,
"davem@davemloft.net" <davem@davemloft.net>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
Subject: Re: pull-request: wireless-drivers-next 2016-05-13
Date: Mon, 16 May 2016 18:11:47 +0000 [thread overview]
Message-ID: <1463422307.25219.107.camel@intel.com> (raw)
In-Reply-To: <87futi858q.fsf@kamboji.qca.qualcomm.com>
On Mon, 2016-05-16 at 17:08 +0300, Kalle Valo wrote:
> Kalle Valo <kvalo@codeaurora.org> writes:
>
> >
> > Kalle Valo <kvalo@codeaurora.org> writes:
> >
> > >
> > > The following changes since commit
> > > ede00a5ceb4d903a8c137a52bb77d574baaef8bd:
> > >
> > > Merge tag 'wireless-drivers-next-for-davem-2016-05-02' of
> > > git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-
> > > drivers-next (2016-05-03 00:35:16 -0400)
> > >
> > > are available in the git repository at:
> > >
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-
> > > drivers-next.git tags/wireless-drivers-next-for-davem-2016-05-13
> > Please don't pull this yet, there might be something wrong now with
> > merges and need to check that first.
> Ok, like discussed in thread "linux-next: manual merge of the
> wireless-drivers-next tree with the net-next tree" there seems to be
> a
> problem on net-next in function iwl_mvm_set_tx_cmd(). Here is how I
> propose to fix this.
>
> When pulling the tag above you should get a conflict like this:
>
> diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c
> index 880210917a6f,779bafcbc9a1..000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
> @@@ -294,7 -295,7 +294,11 @@@ void iwl_mvm_set_tx_cmd(struct iwl_mvm
> tx_cmd->tx_flags = cpu_to_le32(tx_flags);
> /* Total # bytes to be transmitted */
> tx_cmd->len = cpu_to_le16((u16)skb->len +
> ++<<<<<<< HEAD
> + (uintptr_t)info->driver_data[0]);
> ++=======
> + (uintptr_t)skb_info->driver_data[0]);
> ++>>>>>>> master
> tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
> tx_cmd->sta_id = sta_id;
>
> Pick the latter with skb_info and then add skb_info to the beginning
> of
> the same function. So the function should be:
>
> void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
> struct iwl_tx_cmd *tx_cmd,
> struct ieee80211_tx_info *info, u8 sta_id)
> {
> struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
> struct ieee80211_hdr *hdr = (void *)skb->data;
> __le16 fc = hdr->frame_control;
> u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);
> u32 len = skb->len + FCS_LEN;
> u8 ac;
>
> [...]
>
> tx_cmd->tx_flags = cpu_to_le32(tx_flags);
> /* Total # bytes to be transmitted */
> tx_cmd->len = cpu_to_le16((u16)skb->len +
> (uintptr_t)skb_info->driver_data[0]);
> tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
> tx_cmd->sta_id = sta_id;
>
> Sorry about the hassle and please let me know if you have any
> problems.
> Adding Luca and Emmanuel just in case I missed something.
ACK. This looks correct. I just diffed the iwlwifi-next.git tree (at
commit a525d0eab17d -- which is where I merge iwlwifi-fixes into
iwlwifi-next) with net-next.git master and the difference [1] is
exactly what you proposed to fix.
[1] http://pastebin.coelho.fi/1b6907cdb9a25413.txt
--
Cheers,
Luca.
next prev parent reply other threads:[~2016-05-16 18:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-13 11:31 pull-request: wireless-drivers-next 2016-05-13 Kalle Valo
2016-05-13 11:31 ` Kalle Valo
2016-05-16 13:16 ` Kalle Valo
2016-05-16 14:08 ` Kalle Valo
2016-05-16 18:11 ` Coelho, Luciano [this message]
2016-05-16 18:11 ` Coelho, Luciano
2016-05-17 6:43 ` Kalle Valo
2016-05-17 16:21 ` David Miller
2016-05-17 16:21 ` David Miller
2016-05-17 17:12 ` Kalle Valo
2016-05-17 17:12 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463422307.25219.107.camel@intel.com \
--to=luciano.coelho@intel.com \
--cc=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.