All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1463597411.29999.16.camel@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index fab8267..9f597b6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,51 +1,70 @@
-T24gV2VkLCAyMDE2LTA1LTE4IGF0IDExOjQ1IC0wNzAwLCBMaW51cyBUb3J2YWxkcyB3cm90ZToN
-Cj4gT24gV2VkLCBNYXkgMTgsIDIwMTYgYXQgNzoyMyBBTSwgQ29lbGhvLCBMdWNpYW5vDQo+IDxs
-dWNpYW5vLmNvZWxob0BpbnRlbC5jb20+IHdyb3RlOg0KPiA+IA0KPiA+IA0KPiA+IEkgY2FuIGNv
-bmZpcm0gdGhhdCA0LjYgY29udGFpbnMgdGhlIHNhbWUgYnVnLsKgwqBBbmQgcmV2ZXJ0aW5nIHRo
-ZQ0KPiA+IHBhdGNoDQo+ID4gSSBtZW50aW9uZWQgZG9lcyBzb2x2ZSB0aGUgcHJvYmxlbS4uLg0K
-PiA+IA0KPiA+IFRoZSBzYW1lIHBhdGNoIHdvcmtzIGZpbmUgaW4gb3VyIGludGVybmFsIHRyZWUu
-wqDCoEknbGwgaGF2ZSB0bw0KPiA+IGZpZ3VyZQ0KPiA+IG91dCB0b2dldGhlciB3aXRoIEVtbWFu
-dWVsIHdoYXQgdGhlIHByb2JsZW0gYWN0dWFsbHkgaXMuDQo+IEhtbS4NCj4gDQo+IEZyb20gd2hh
-dCBJIGNhbiB0ZWxsLCB0aGVyZSdzIGEgbWVyZ2UgYnVnIGluIGNvbW1pdCA5MDliMjdmNzA2NDMs
-DQo+IHdoZXJlIERhdmlkIHNlZW1zIHRvIGhhdmUgbG9zdCBzb21lIG9mIHRoZSBjaGFuZ2VzIHRv
-DQo+IGl3bF9tdm1fc2V0X3R4X2NtZCgpLg0KPiANCj4gVGhlIHJlYXNvbiBzZWVtcyB0byBiZSBh
-IGNvbmZsaWN0IHdpdGggZDhmZTQ4NDQ3MGRkLCB3aGVyZSBEYXZpZA0KPiBtaXNzZWQgdGhlIGZh
-Y3QgdGhhdCAiaW5mby0+ZHJpdmVyX2RhdGFbMF0iIGhhZCBiZWNvbWUNCj4gInNrYl9pbmZvLT5k
-cml2ZXJfZGF0YVswXSIsIGFuZCB0aGVuIGhlIHJlbW92ZWQgdGhlIHNrYl9pbmZvIGJlY2F1c2UN
-Cj4gaXQgd2FzIHVudXNlZC4NCj4gDQo+IEkgZG8gbm90IGtub3cgaWYgdGhhdCdzIHRoZSByZWFz
-b24gZm9yIHRoZSBwcm9ibGVtIEkgc2VlLiBCdXQgSSB3aWxsDQo+IHRlc3QuDQo+IA0KPiBEYXZp
-ZCwgZG8geW91IGhhcHBlbiB0byByZWNhbGwgdGhhdCBtZXJnZSBjb25mbGljdD8gSSB0aGluayB5
-b3UgbXVzdA0KPiBoYXZlIHJlbW92ZWQgdGhhdCAic2tiX2luZm8iIHZhcmlhYmxlIGRlY2xhcmF0
-aW9uIGFuZCBpbml0aWFsaXphdGlvbg0KPiBtYW51YWxseSAoZHVlIHRvIHRoZSAidW51c2VkIHZh
-cmlhYmxlIiB3YXJuaW5nLCB3aGljaCBpbiB0dXJuIHdhcyBkdWUNCj4gdG8gdGhlIGluY29ycmVj
-dCBtZXJnZSBvZiB0aGUgYWN0dWFsIGNvbmZsaWN0KSwgYmVjYXVzZSBJIHRoaW5rIGdpdA0KPiB3
-b3VsZCBoYXZlIG1lcmdlZCB0aGF0IGxpbmUgaW50byB0aGUgcmVzdWx0Lg0KDQpBY3R1YWxseSBJ
-IGp1c3QgdGVzdGVkIGl0IGFuZCBpbmRlZWQgaXQgc2VlbXMgdG8gYmUgdGhlIG1lcmdlIGRhbWFn
-ZQ0KKHdoaWNoIHdlIGRpc2N1c3NlZCBleHRlbnNpdmVseSBpbiB0aGUgbGludXgtd2lyZWxlc3Mg
-bWFpbGluZyBsaXN0KQ0KdGhhdCBjYXVzZXMgdGhpcyBwcm9ibGVtLiDCoFRoZSAiNC42IGRvZXNu
-J3Qgd29yayBlaXRoZXIiIHRoaW5nIHdhcyBhDQpmYWxzZSBhbGFybS4NCg0KSWYgdGhlIG1lcmdl
-IGRhbWFnZSBpcyBmaXhlZCB0aGlzIHdheSwgdGhlIHByb2JsZW0gaXMgZ29uZToNCg0KZGlmZiAt
-LWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMNCmIvZHJp
-dmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vdHguYw0KaW5kZXggYjVmN2MzNi4u
-YWUyZWNmNiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkv
-bXZtL3R4LmMNCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4
-LmMNCkBAIC0yMTEsNiArMjExLDcgQEAgdm9pZCBpd2xfbXZtX3NldF90eF9jbWQoc3RydWN0IGl3
-bF9tdm0gKm12bSwgc3RydWN0DQpza19idWZmICpza2IsDQrCoMKgwqDCoMKgwqDCoMKgwqDCoMKg
-wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBzdHJ1Y3QgaXdsX3R4X2NtZCAqdHhfY21kLA0KwqDC
-oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgc3RydWN0IGllZWU4
-MDIxMV90eF9pbmZvICppbmZvLCB1OCBzdGFfaWQpDQrCoHsNCivCoMKgwqDCoMKgwqDCoHN0cnVj
-dCBpZWVlODAyMTFfdHhfaW5mbyAqc2tiX2luZm8gPSBJRUVFODAyMTFfU0tCX0NCKHNrYik7DQrC
-oMKgwqDCoMKgwqDCoMKgc3RydWN0IGllZWU4MDIxMV9oZHIgKmhkciA9ICh2b2lkICopc2tiLT5k
-YXRhOw0KwqDCoMKgwqDCoMKgwqDCoF9fbGUxNiBmYyA9IGhkci0+ZnJhbWVfY29udHJvbDsNCsKg
-wqDCoMKgwqDCoMKgwqB1MzIgdHhfZmxhZ3MgPSBsZTMyX3RvX2NwdSh0eF9jbWQtPnR4X2ZsYWdz
-KTsNCkBAIC0yOTQsNyArMjk1LDcgQEAgdm9pZCBpd2xfbXZtX3NldF90eF9jbWQoc3RydWN0IGl3
-bF9tdm0gKm12bSwgc3RydWN0DQpza19idWZmICpza2IsDQrCoMKgwqDCoMKgwqDCoMKgdHhfY21k
-LT50eF9mbGFncyA9IGNwdV90b19sZTMyKHR4X2ZsYWdzKTsNCsKgwqDCoMKgwqDCoMKgwqAvKiBU
-b3RhbCAjIGJ5dGVzIHRvIGJlIHRyYW5zbWl0dGVkICovDQrCoMKgwqDCoMKgwqDCoMKgdHhfY21k
-LT5sZW4gPSBjcHVfdG9fbGUxNigodTE2KXNrYi0+bGVuICsNCi3CoMKgwqDCoMKgwqDCoMKgwqDC
-oMKgwqDCoMKgwqAodWludHB0cl90KWluZm8tPmRyaXZlcl9kYXRhWzBdKTsNCivCoMKgwqDCoMKg
-wqDCoMKgwqDCoMKgwqDCoMKgwqAodWludHB0cl90KXNrYl9pbmZvLT5kcml2ZXJfZGF0YVswXSk7
-DQrCoMKgwqDCoMKgwqDCoMKgdHhfY21kLT5saWZlX3RpbWUgPSBjcHVfdG9fbGUzMihUWF9DTURf
-TElGRV9USU1FX0lORklOSVRFKTsNCsKgwqDCoMKgwqDCoMKgwqB0eF9jbWQtPnN0YV9pZCA9IHN0
-YV9pZDsNCg0KDQpLYWxsZSwgRGF2aWQsIHdoYXQgaXMgdGhlIHN0YXR1cyB3aXRoIHRoZSBmaXgg
-dGhhdCBpcyBvbiB0aGUgd2F5IHZpYQ0KeW91ciB0cmVlcz8NCg0KLS0NCkNoZWVycywNCkx1Y2Eu
+On Wed, 2016-05-18 at 11:45 -0700, Linus Torvalds wrote:
+> On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano
+> <luciano.coelho@intel.com> wrote:
+> > 
+> > 
+> > I can confirm that 4.6 contains the same bug.  And reverting the
+> > patch
+> > I mentioned does solve the problem...
+> > 
+> > The same patch works fine in our internal tree.  I'll have to
+> > figure
+> > out together with Emmanuel what the problem actually is.
+> Hmm.
+> 
+> From what I can tell, there's a merge bug in commit 909b27f70643,
+> where David seems to have lost some of the changes to
+> iwl_mvm_set_tx_cmd().
+> 
+> The reason seems to be a conflict with d8fe484470dd, where David
+> missed the fact that "info->driver_data[0]" had become
+> "skb_info->driver_data[0]", and then he removed the skb_info because
+> it was unused.
+> 
+> I do not know if that's the reason for the problem I see. But I will
+> test.
+> 
+> David, do you happen to recall that merge conflict? I think you must
+> have removed that "skb_info" variable declaration and initialization
+> manually (due to the "unused variable" warning, which in turn was due
+> to the incorrect merge of the actual conflict), because I think git
+> would have merged that line into the result.
+
+Actually I just tested it and indeed it seems to be the merge damage
+(which we discussed extensively in the linux-wireless mailing list)
+that causes this problem.  The "4.6 doesn't work either" thing was a
+false alarm.
+
+If the merge damage is fixed this way, the problem is gone:
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+index b5f7c36..ae2ecf6 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+@@ -211,6 +211,7 @@ 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);
+@@ -294,7 +295,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct
+sk_buff *skb,
+        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)info->driver_data[0]);
++               (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;
+
+
+Kalle, David, what is the status with the fix that is on the way via
+your trees?
+
+--
+Cheers,
+Luca.
diff --git a/a/content_digest b/N1/content_digest
index 911c7dc..574c535 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -26,56 +26,75 @@
  " Emmanuel <emmanuel.grumbach@intel.com>\0"
  "\00:1\0"
  "b\0"
- "T24gV2VkLCAyMDE2LTA1LTE4IGF0IDExOjQ1IC0wNzAwLCBMaW51cyBUb3J2YWxkcyB3cm90ZToN\n"
- "Cj4gT24gV2VkLCBNYXkgMTgsIDIwMTYgYXQgNzoyMyBBTSwgQ29lbGhvLCBMdWNpYW5vDQo+IDxs\n"
- "dWNpYW5vLmNvZWxob0BpbnRlbC5jb20+IHdyb3RlOg0KPiA+IA0KPiA+IA0KPiA+IEkgY2FuIGNv\n"
- "bmZpcm0gdGhhdCA0LjYgY29udGFpbnMgdGhlIHNhbWUgYnVnLsKgwqBBbmQgcmV2ZXJ0aW5nIHRo\n"
- "ZQ0KPiA+IHBhdGNoDQo+ID4gSSBtZW50aW9uZWQgZG9lcyBzb2x2ZSB0aGUgcHJvYmxlbS4uLg0K\n"
- "PiA+IA0KPiA+IFRoZSBzYW1lIHBhdGNoIHdvcmtzIGZpbmUgaW4gb3VyIGludGVybmFsIHRyZWUu\n"
- "wqDCoEknbGwgaGF2ZSB0bw0KPiA+IGZpZ3VyZQ0KPiA+IG91dCB0b2dldGhlciB3aXRoIEVtbWFu\n"
- "dWVsIHdoYXQgdGhlIHByb2JsZW0gYWN0dWFsbHkgaXMuDQo+IEhtbS4NCj4gDQo+IEZyb20gd2hh\n"
- "dCBJIGNhbiB0ZWxsLCB0aGVyZSdzIGEgbWVyZ2UgYnVnIGluIGNvbW1pdCA5MDliMjdmNzA2NDMs\n"
- "DQo+IHdoZXJlIERhdmlkIHNlZW1zIHRvIGhhdmUgbG9zdCBzb21lIG9mIHRoZSBjaGFuZ2VzIHRv\n"
- "DQo+IGl3bF9tdm1fc2V0X3R4X2NtZCgpLg0KPiANCj4gVGhlIHJlYXNvbiBzZWVtcyB0byBiZSBh\n"
- "IGNvbmZsaWN0IHdpdGggZDhmZTQ4NDQ3MGRkLCB3aGVyZSBEYXZpZA0KPiBtaXNzZWQgdGhlIGZh\n"
- "Y3QgdGhhdCAiaW5mby0+ZHJpdmVyX2RhdGFbMF0iIGhhZCBiZWNvbWUNCj4gInNrYl9pbmZvLT5k\n"
- "cml2ZXJfZGF0YVswXSIsIGFuZCB0aGVuIGhlIHJlbW92ZWQgdGhlIHNrYl9pbmZvIGJlY2F1c2UN\n"
- "Cj4gaXQgd2FzIHVudXNlZC4NCj4gDQo+IEkgZG8gbm90IGtub3cgaWYgdGhhdCdzIHRoZSByZWFz\n"
- "b24gZm9yIHRoZSBwcm9ibGVtIEkgc2VlLiBCdXQgSSB3aWxsDQo+IHRlc3QuDQo+IA0KPiBEYXZp\n"
- "ZCwgZG8geW91IGhhcHBlbiB0byByZWNhbGwgdGhhdCBtZXJnZSBjb25mbGljdD8gSSB0aGluayB5\n"
- "b3UgbXVzdA0KPiBoYXZlIHJlbW92ZWQgdGhhdCAic2tiX2luZm8iIHZhcmlhYmxlIGRlY2xhcmF0\n"
- "aW9uIGFuZCBpbml0aWFsaXphdGlvbg0KPiBtYW51YWxseSAoZHVlIHRvIHRoZSAidW51c2VkIHZh\n"
- "cmlhYmxlIiB3YXJuaW5nLCB3aGljaCBpbiB0dXJuIHdhcyBkdWUNCj4gdG8gdGhlIGluY29ycmVj\n"
- "dCBtZXJnZSBvZiB0aGUgYWN0dWFsIGNvbmZsaWN0KSwgYmVjYXVzZSBJIHRoaW5rIGdpdA0KPiB3\n"
- "b3VsZCBoYXZlIG1lcmdlZCB0aGF0IGxpbmUgaW50byB0aGUgcmVzdWx0Lg0KDQpBY3R1YWxseSBJ\n"
- "IGp1c3QgdGVzdGVkIGl0IGFuZCBpbmRlZWQgaXQgc2VlbXMgdG8gYmUgdGhlIG1lcmdlIGRhbWFn\n"
- "ZQ0KKHdoaWNoIHdlIGRpc2N1c3NlZCBleHRlbnNpdmVseSBpbiB0aGUgbGludXgtd2lyZWxlc3Mg\n"
- "bWFpbGluZyBsaXN0KQ0KdGhhdCBjYXVzZXMgdGhpcyBwcm9ibGVtLiDCoFRoZSAiNC42IGRvZXNu\n"
- "J3Qgd29yayBlaXRoZXIiIHRoaW5nIHdhcyBhDQpmYWxzZSBhbGFybS4NCg0KSWYgdGhlIG1lcmdl\n"
- "IGRhbWFnZSBpcyBmaXhlZCB0aGlzIHdheSwgdGhlIHByb2JsZW0gaXMgZ29uZToNCg0KZGlmZiAt\n"
- "LWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMNCmIvZHJp\n"
- "dmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vdHguYw0KaW5kZXggYjVmN2MzNi4u\n"
- "YWUyZWNmNiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkv\n"
- "bXZtL3R4LmMNCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4\n"
- "LmMNCkBAIC0yMTEsNiArMjExLDcgQEAgdm9pZCBpd2xfbXZtX3NldF90eF9jbWQoc3RydWN0IGl3\n"
- "bF9tdm0gKm12bSwgc3RydWN0DQpza19idWZmICpza2IsDQrCoMKgwqDCoMKgwqDCoMKgwqDCoMKg\n"
- "wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBzdHJ1Y3QgaXdsX3R4X2NtZCAqdHhfY21kLA0KwqDC\n"
- "oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgc3RydWN0IGllZWU4\n"
- "MDIxMV90eF9pbmZvICppbmZvLCB1OCBzdGFfaWQpDQrCoHsNCivCoMKgwqDCoMKgwqDCoHN0cnVj\n"
- "dCBpZWVlODAyMTFfdHhfaW5mbyAqc2tiX2luZm8gPSBJRUVFODAyMTFfU0tCX0NCKHNrYik7DQrC\n"
- "oMKgwqDCoMKgwqDCoMKgc3RydWN0IGllZWU4MDIxMV9oZHIgKmhkciA9ICh2b2lkICopc2tiLT5k\n"
- "YXRhOw0KwqDCoMKgwqDCoMKgwqDCoF9fbGUxNiBmYyA9IGhkci0+ZnJhbWVfY29udHJvbDsNCsKg\n"
- "wqDCoMKgwqDCoMKgwqB1MzIgdHhfZmxhZ3MgPSBsZTMyX3RvX2NwdSh0eF9jbWQtPnR4X2ZsYWdz\n"
- "KTsNCkBAIC0yOTQsNyArMjk1LDcgQEAgdm9pZCBpd2xfbXZtX3NldF90eF9jbWQoc3RydWN0IGl3\n"
- "bF9tdm0gKm12bSwgc3RydWN0DQpza19idWZmICpza2IsDQrCoMKgwqDCoMKgwqDCoMKgdHhfY21k\n"
- "LT50eF9mbGFncyA9IGNwdV90b19sZTMyKHR4X2ZsYWdzKTsNCsKgwqDCoMKgwqDCoMKgwqAvKiBU\n"
- "b3RhbCAjIGJ5dGVzIHRvIGJlIHRyYW5zbWl0dGVkICovDQrCoMKgwqDCoMKgwqDCoMKgdHhfY21k\n"
- "LT5sZW4gPSBjcHVfdG9fbGUxNigodTE2KXNrYi0+bGVuICsNCi3CoMKgwqDCoMKgwqDCoMKgwqDC\n"
- "oMKgwqDCoMKgwqAodWludHB0cl90KWluZm8tPmRyaXZlcl9kYXRhWzBdKTsNCivCoMKgwqDCoMKg\n"
- "wqDCoMKgwqDCoMKgwqDCoMKgwqAodWludHB0cl90KXNrYl9pbmZvLT5kcml2ZXJfZGF0YVswXSk7\n"
- "DQrCoMKgwqDCoMKgwqDCoMKgdHhfY21kLT5saWZlX3RpbWUgPSBjcHVfdG9fbGUzMihUWF9DTURf\n"
- "TElGRV9USU1FX0lORklOSVRFKTsNCsKgwqDCoMKgwqDCoMKgwqB0eF9jbWQtPnN0YV9pZCA9IHN0\n"
- "YV9pZDsNCg0KDQpLYWxsZSwgRGF2aWQsIHdoYXQgaXMgdGhlIHN0YXR1cyB3aXRoIHRoZSBmaXgg\n"
- dGhhdCBpcyBvbiB0aGUgd2F5IHZpYQ0KeW91ciB0cmVlcz8NCg0KLS0NCkNoZWVycywNCkx1Y2Eu
+ "On Wed, 2016-05-18 at 11:45 -0700, Linus Torvalds wrote:\n"
+ "> On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano\n"
+ "> <luciano.coelho@intel.com> wrote:\n"
+ "> > \n"
+ "> > \n"
+ "> > I can confirm that 4.6 contains the same bug.\302\240\302\240And reverting the\n"
+ "> > patch\n"
+ "> > I mentioned does solve the problem...\n"
+ "> > \n"
+ "> > The same patch works fine in our internal tree.\302\240\302\240I'll have to\n"
+ "> > figure\n"
+ "> > out together with Emmanuel what the problem actually is.\n"
+ "> Hmm.\n"
+ "> \n"
+ "> From what I can tell, there's a merge bug in commit 909b27f70643,\n"
+ "> where David seems to have lost some of the changes to\n"
+ "> iwl_mvm_set_tx_cmd().\n"
+ "> \n"
+ "> The reason seems to be a conflict with d8fe484470dd, where David\n"
+ "> missed the fact that \"info->driver_data[0]\" had become\n"
+ "> \"skb_info->driver_data[0]\", and then he removed the skb_info because\n"
+ "> it was unused.\n"
+ "> \n"
+ "> I do not know if that's the reason for the problem I see. But I will\n"
+ "> test.\n"
+ "> \n"
+ "> David, do you happen to recall that merge conflict? I think you must\n"
+ "> have removed that \"skb_info\" variable declaration and initialization\n"
+ "> manually (due to the \"unused variable\" warning, which in turn was due\n"
+ "> to the incorrect merge of the actual conflict), because I think git\n"
+ "> would have merged that line into the result.\n"
+ "\n"
+ "Actually I just tested it and indeed it seems to be the merge damage\n"
+ "(which we discussed extensively in the linux-wireless mailing list)\n"
+ "that causes this problem. \302\240The \"4.6 doesn't work either\" thing was a\n"
+ "false alarm.\n"
+ "\n"
+ "If the merge damage is fixed this way, the problem is gone:\n"
+ "\n"
+ "diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n"
+ "b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n"
+ "index b5f7c36..ae2ecf6 100644\n"
+ "--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n"
+ "+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c\n"
+ "@@ -211,6 +211,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct\n"
+ "sk_buff *skb,\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\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct iwl_tx_cmd *tx_cmd,\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\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct ieee80211_tx_info *info, u8 sta_id)\n"
+ "\302\240{\n"
+ "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct ieee80211_hdr *hdr = (void *)skb->data;\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240__le16 fc = hdr->frame_control;\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);\n"
+ "@@ -294,7 +295,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct\n"
+ "sk_buff *skb,\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"
+ "-\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"
+ "+\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"
+ "\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"
+ "\n"
+ "Kalle, David, what is the status with the fix that is on the way via\n"
+ "your trees?\n"
+ "\n"
+ "--\n"
+ "Cheers,\n"
+ Luca.
 
-3e0e02ee15b6b82d8ce5bef87ed57e706df6891fd219cc39207c1f9441756722
+0138ece9ef0fb9f8e6d0bb3c9adfae151722689f877475a2983d8d0dc631755e

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.