diff for duplicates of <1463422307.25219.107.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 35e2b41..bd0027c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,56 +1,83 @@ -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= +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. diff --git a/a/content_digest b/N1/content_digest index 6054b06..840cc2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,61 +12,88 @@ " Emmanuel <emmanuel.grumbach@intel.com>\0" "\00:1\0" "b\0" - "T24gTW9uLCAyMDE2LTA1LTE2IGF0IDE3OjA4ICswMzAwLCBLYWxsZSBWYWxvIHdyb3RlOg0KPiBL\n" - "YWxsZSBWYWxvIDxrdmFsb0Bjb2RlYXVyb3JhLm9yZz4gd3JpdGVzOg0KPiANCj4gPiANCj4gPiBL\n" - "YWxsZSBWYWxvIDxrdmFsb0Bjb2RlYXVyb3JhLm9yZz4gd3JpdGVzOg0KPiA+IA0KPiA+ID4gDQo+\n" - "ID4gPiBUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29tbWl0DQo+ID4gPiBlZGUwMGE1Y2Vi\n" - "NGQ5MDNhOGMxMzdhNTJiYjc3ZDU3NGJhYWVmOGJkOg0KPiA+ID4gDQo+ID4gPiDCoCBNZXJnZSB0\n" - "YWcgJ3dpcmVsZXNzLWRyaXZlcnMtbmV4dC1mb3ItZGF2ZW0tMjAxNi0wNS0wMicgb2YNCj4gPiA+\n" - "IGdpdDovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9rdmFsby93aXJl\n" - "bGVzcy0NCj4gPiA+IGRyaXZlcnMtbmV4dCAoMjAxNi0wNS0wMyAwMDozNToxNiAtMDQwMCkNCj4g\n" - "PiA+IA0KPiA+ID4gYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6DQo+ID4g\n" - "PiANCj4gPiA+IA0KPiA+ID4gwqAgZ2l0Oi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9r\n" - "ZXJuZWwvZ2l0L2t2YWxvL3dpcmVsZXNzLQ0KPiA+ID4gZHJpdmVycy1uZXh0LmdpdCB0YWdzL3dp\n" - "cmVsZXNzLWRyaXZlcnMtbmV4dC1mb3ItZGF2ZW0tMjAxNi0wNS0xMw0KPiA+IFBsZWFzZSBkb24n\n" - "dCBwdWxsIHRoaXMgeWV0LCB0aGVyZSBtaWdodCBiZSBzb21ldGhpbmcgd3Jvbmcgbm93IHdpdGgN\n" - "Cj4gPiBtZXJnZXMgYW5kIG5lZWQgdG8gY2hlY2sgdGhhdCBmaXJzdC4NCj4gT2ssIGxpa2UgZGlz\n" - "Y3Vzc2VkIGluIHRocmVhZCAibGludXgtbmV4dDogbWFudWFsIG1lcmdlIG9mIHRoZQ0KPiB3aXJl\n" - "bGVzcy1kcml2ZXJzLW5leHQgdHJlZSB3aXRoIHRoZSBuZXQtbmV4dCB0cmVlIiB0aGVyZSBzZWVt\n" - "cyB0byBiZQ0KPiBhDQo+IHByb2JsZW0gb24gbmV0LW5leHQgaW4gZnVuY3Rpb24gaXdsX212bV9z\n" - "ZXRfdHhfY21kKCkuIEhlcmUgaXMgaG93IEkNCj4gcHJvcG9zZSB0byBmaXggdGhpcy4NCj4gDQo+\n" - "IFdoZW4gcHVsbGluZyB0aGUgdGFnIGFib3ZlIHlvdSBzaG91bGQgZ2V0IGEgY29uZmxpY3QgbGlr\n" - "ZSB0aGlzOg0KPiANCj4gZGlmZiAtLWNjIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdp\n" - "ZmkvbXZtL3R4LmMNCj4gaW5kZXggODgwMjEwOTE3YTZmLDc3OWJhZmNiYzlhMS4uMDAwMDAwMDAw\n" - "MDAwDQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMN\n" - "Cj4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vdHguYw0KPiBA\n" - "QEAgLTI5NCw3IC0yOTUsNyArMjk0LDExIEBAQCB2b2lkIGl3bF9tdm1fc2V0X3R4X2NtZChzdHJ1\n" - "Y3QgaXdsX212bcKgDQo+IMKgwqDCoMKgwqDCoMKgwqB0eF9jbWQtPnR4X2ZsYWdzID0gY3B1X3Rv\n" - "X2xlMzIodHhfZmxhZ3MpOw0KPiDCoMKgwqDCoMKgwqDCoMKgLyogVG90YWwgIyBieXRlcyB0byBi\n" - "ZSB0cmFuc21pdHRlZCAqLw0KPiDCoMKgwqDCoMKgwqDCoMKgdHhfY21kLT5sZW4gPSBjcHVfdG9f\n" - "bGUxNigodTE2KXNrYi0+bGVuICsNCj4gKys8PDw8PDw8IEhFQUQNCj4gwqArwqDCoMKgwqDCoMKg\n" - "wqDCoMKgwqDCoMKgwqDCoCh1aW50cHRyX3QpaW5mby0+ZHJpdmVyX2RhdGFbMF0pOw0KPiArKz09\n" - "PT09PT0NCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCh1aW50cHRyX3Qpc2tiX2lu\n" - "Zm8tPmRyaXZlcl9kYXRhWzBdKTsNCj4gKys+Pj4+Pj4+IG1hc3Rlcg0KPiDCoMKgwqDCoMKgwqDC\n" - "oMKgdHhfY21kLT5saWZlX3RpbWUgPSBjcHVfdG9fbGUzMihUWF9DTURfTElGRV9USU1FX0lORklO\n" - "SVRFKTsNCj4gwqDCoMKgwqDCoMKgwqDCoHR4X2NtZC0+c3RhX2lkID0gc3RhX2lkOw0KPiANCj4g\n" - "UGljayB0aGUgbGF0dGVyIHdpdGggc2tiX2luZm8gYW5kIHRoZW4gYWRkIHNrYl9pbmZvIHRvIHRo\n" - "ZSBiZWdpbm5pbmcNCj4gb2YNCj4gdGhlIHNhbWUgZnVuY3Rpb24uIFNvIHRoZSBmdW5jdGlvbiBz\n" - "aG91bGQgYmU6DQo+IA0KPiB2b2lkIGl3bF9tdm1fc2V0X3R4X2NtZChzdHJ1Y3QgaXdsX212bSAq\n" - "bXZtLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiLA0KPiAJCQlzdHJ1Y3QgaXdsX3R4X2NtZCAqdHhfY21k\n" - "LA0KPiAJCQlzdHJ1Y3QgaWVlZTgwMjExX3R4X2luZm8gKmluZm8sIHU4IHN0YV9pZCkNCj4gew0K\n" - "PiAJc3RydWN0IGllZWU4MDIxMV90eF9pbmZvICpza2JfaW5mbyA9IElFRUU4MDIxMV9TS0JfQ0Io\n" - "c2tiKTsNCj4gCXN0cnVjdCBpZWVlODAyMTFfaGRyICpoZHIgPSAodm9pZCAqKXNrYi0+ZGF0YTsN\n" - "Cj4gCV9fbGUxNiBmYyA9IGhkci0+ZnJhbWVfY29udHJvbDsNCj4gCXUzMiB0eF9mbGFncyA9IGxl\n" - "MzJfdG9fY3B1KHR4X2NtZC0+dHhfZmxhZ3MpOw0KPiAJdTMyIGxlbiA9IHNrYi0+bGVuICsgRkNT\n" - "X0xFTjsNCj4gCXU4IGFjOw0KPiANCj4gWy4uLl0NCj4gDQo+IAl0eF9jbWQtPnR4X2ZsYWdzID0g\n" - "Y3B1X3RvX2xlMzIodHhfZmxhZ3MpOw0KPiAJLyogVG90YWwgIyBieXRlcyB0byBiZSB0cmFuc21p\n" - "dHRlZCAqLw0KPiAJdHhfY21kLT5sZW4gPSBjcHVfdG9fbGUxNigodTE2KXNrYi0+bGVuICsNCj4g\n" - "CQkodWludHB0cl90KXNrYl9pbmZvLT5kcml2ZXJfZGF0YVswXSk7DQo+IAl0eF9jbWQtPmxpZmVf\n" - "dGltZSA9IGNwdV90b19sZTMyKFRYX0NNRF9MSUZFX1RJTUVfSU5GSU5JVEUpOw0KPiAJdHhfY21k\n" - "LT5zdGFfaWQgPSBzdGFfaWQ7DQo+IA0KPiBTb3JyeSBhYm91dCB0aGUgaGFzc2xlIGFuZCBwbGVh\n" - "c2UgbGV0IG1lIGtub3cgaWYgeW91IGhhdmUgYW55DQo+IHByb2JsZW1zLg0KPiBBZGRpbmcgTHVj\n" - "YSBhbmQgRW1tYW51ZWwganVzdCBpbiBjYXNlIEkgbWlzc2VkIHNvbWV0aGluZy4NCg0KQUNLLiDC\n" - "oFRoaXMgbG9va3MgY29ycmVjdC4gwqBJIGp1c3QgZGlmZmVkIHRoZSBpd2x3aWZpLW5leHQuZ2l0\n" - "IHRyZWUgKGF0DQpjb21taXQgYTUyNWQwZWFiMTdkIC0tIHdoaWNoIGlzIHdoZXJlIEkgbWVyZ2Ug\n" - "aXdsd2lmaS1maXhlcyBpbnRvDQppd2x3aWZpLW5leHQpIHdpdGggbmV0LW5leHQuZ2l0IG1hc3Rl\n" - "ciBhbmQgdGhlIGRpZmZlcmVuY2UgWzFdwqBpcw0KZXhhY3RseSB3aGF0IHlvdSBwcm9wb3NlZCB0\n" - "byBmaXguDQoNClsxXcKgaHR0cDovL3Bhc3RlYmluLmNvZWxoby5maS8xYjY5MDdjZGI5YTI1NDEz\n" - LnR4dA0KDQotLQ0KQ2hlZXJzLA0KTHVjYS4= + "On Mon, 2016-05-16 at 17:08 +0300, Kalle Valo wrote:\n" + "> Kalle Valo <kvalo@codeaurora.org> writes:\n" + "> \n" + "> > \n" + "> > Kalle Valo <kvalo@codeaurora.org> writes:\n" + "> > \n" + "> > > \n" + "> > > The following changes since commit\n" + "> > > ede00a5ceb4d903a8c137a52bb77d574baaef8bd:\n" + "> > > \n" + "> > > \302\240 Merge tag 'wireless-drivers-next-for-davem-2016-05-02' of\n" + "> > > git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-\n" + "> > > drivers-next (2016-05-03 00:35:16 -0400)\n" + "> > > \n" + "> > > are available in the git repository at:\n" + "> > > \n" + "> > > \n" + "> > > \302\240 git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-\n" + "> > > drivers-next.git tags/wireless-drivers-next-for-davem-2016-05-13\n" + "> > Please don't pull this yet, there might be something wrong now with\n" + "> > merges and need to check that first.\n" + "> Ok, like discussed in thread \"linux-next: manual merge of the\n" + "> wireless-drivers-next tree with the net-next tree\" there seems to be\n" + "> a\n" + "> problem on net-next in function iwl_mvm_set_tx_cmd(). Here is how I\n" + "> propose to fix this.\n" + "> \n" + "> When pulling the tag above you should get a conflict like this:\n" + "> \n" + "> diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n" + "> index 880210917a6f,779bafcbc9a1..000000000000\n" + "> --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n" + "> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n" + "> @@@ -294,7 -295,7 +294,11 @@@ void iwl_mvm_set_tx_cmd(struct iwl_mvm\302\240\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240tx_cmd->tx_flags = cpu_to_le32(tx_flags);\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240/* Total # bytes to be transmitted */\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240tx_cmd->len = cpu_to_le16((u16)skb->len +\n" + "> ++<<<<<<< HEAD\n" + "> \302\240+\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240(uintptr_t)info->driver_data[0]);\n" + "> ++=======\n" + "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240(uintptr_t)skb_info->driver_data[0]);\n" + "> ++>>>>>>> master\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240tx_cmd->sta_id = sta_id;\n" + "> \n" + "> Pick the latter with skb_info and then add skb_info to the beginning\n" + "> of\n" + "> the same function. So the function should be:\n" + "> \n" + "> void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,\n" + "> \t\t\tstruct iwl_tx_cmd *tx_cmd,\n" + "> \t\t\tstruct ieee80211_tx_info *info, u8 sta_id)\n" + "> {\n" + "> \tstruct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);\n" + "> \tstruct ieee80211_hdr *hdr = (void *)skb->data;\n" + "> \t__le16 fc = hdr->frame_control;\n" + "> \tu32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);\n" + "> \tu32 len = skb->len + FCS_LEN;\n" + "> \tu8 ac;\n" + "> \n" + "> [...]\n" + "> \n" + "> \ttx_cmd->tx_flags = cpu_to_le32(tx_flags);\n" + "> \t/* Total # bytes to be transmitted */\n" + "> \ttx_cmd->len = cpu_to_le16((u16)skb->len +\n" + "> \t\t(uintptr_t)skb_info->driver_data[0]);\n" + "> \ttx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);\n" + "> \ttx_cmd->sta_id = sta_id;\n" + "> \n" + "> Sorry about the hassle and please let me know if you have any\n" + "> problems.\n" + "> Adding Luca and Emmanuel just in case I missed something.\n" + "\n" + "ACK. \302\240This looks correct. \302\240I just diffed the iwlwifi-next.git tree (at\n" + "commit a525d0eab17d -- which is where I merge iwlwifi-fixes into\n" + "iwlwifi-next) with net-next.git master and the difference [1]\302\240is\n" + "exactly what you proposed to fix.\n" + "\n" + "[1]\302\240http://pastebin.coelho.fi/1b6907cdb9a25413.txt\n" + "\n" + "--\n" + "Cheers,\n" + Luca. -fe8092096494b54065183f7c71bc1dbb264e08771a112b70957c265f0b218bb7 +4c77e39986bd7f12e52f90ea392dc6b4f5bcb8acafca8f4959e8e5f1ec6778b4
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.