Skip to contentSkip to conversation

staging: rtl8192u: ieee80211: Fix sparse endianness warnings

PATCH RESEND Superseded Gaston Gonzalez 2 participants 9 messages May 31, 2015 – Jun 1, 2015 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 staging: rtl8192u: ieee80211: Fix sparse endianness warnings

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));

- auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
- if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+ auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+ if (challengelen)
+ auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);

auth->header.duration_id = 0x013a; //FIXME

--
2.1.4

maintainer
#1 lore raw
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Quoted 5 lines

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

#2 lore raw
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

I'll try with a newer version of git as you suggest.
Any other check I could do before the submission? I really don't like making noise :-(

Thanks,

Gaston

Quoted 9 lines
Quoted 9 lines

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

maintainer
#3 lore raw
Quoted 51 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

Quoted 8 lines

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Quoted 3 lines

I'll try with a newer version of git as you suggest.
Any other check I could do before the submission? I really don't like making noise :-(

Let's see the original version first before blaming git. Odds are you got something wrong when editing the patch by hand.

thanks,

greg k-h

#4 lore raw
Quoted 57 lines · Greg KH
Quoted 56 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

Quoted 8 lines
Quoted 3 lines

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

Yes, there was a commit. In fact the patch prepare: git format-patch -1

Quoted 2 lines

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Attached the original patch I submitted:
0001-Regen-ieee80211_softmac.c-endianness-fix-patch.patch

Attached is also the patch without the hand-edited deletions:

ieee80211_softmac_fixes_v3.patch

My steps once having this were:

- run perl checkpatch -f
- I got total: 4 errors, 0 warnings, 28 lines checked. The 4 warnings were extra white spaces.
- Delete the spaces
- git send-email --annotate Patch

Quoted 8 lines
Quoted 4 lines

I'll try with a newer version of git as you suggest.
Any other check I could do before the submission? I really don't like making noise :-(

Let's see the original version first before blaming git. Odds are you got something wrong when editing the patch by hand.

Ok.

Quoted 3 lines

thanks,

greg k-h

thanks,

Gaston

Quoted 1 line

From b689a6d0de2a2d483e012698996b7bda9a33d6e2 Mon Sep 17 00:00:00 2001

From: Gaston Gonzalez <[email protected]>
Date: Sun, 31 May 2015 01:07:54 -0300
Subject: [PATCH RESEND] staging: rtl8192u: ieee80211: Fix sparse endianness warnings

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));

- auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
- if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+ auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+ if (challengelen)
+ auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);

auth->header.duration_id = 0x013a; //FIXME

--
2.1.4

Quoted 1 line

From b689a6d0de2a2d483e012698996b7bda9a33d6e2 Mon Sep 17 00:00:00 2001

From: Gaston Gonzalez <[email protected]>
Date: Sun, 31 May 2015 01:07:54 -0300
Subject: [PATCH] Regen ieee80211_softmac.c endianness fix patch

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -2
index d2e8b12..0477ba1 100644
@@ -660,8 +660,9 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
Signature · 1 line
2.1.4
maintainer
#5 lore raw
Quoted 67 lines · Gaston Gonzalez
Quoted 57 lines · Greg KH
Quoted 56 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

Quoted 8 lines
Quoted 3 lines

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

Quoted 7 lines

Yes, there was a commit. In fact the patch prepare: git format-patch -1

Quoted 2 lines

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Attached the original patch I submitted:
0001-Regen-ieee80211_softmac.c-endianness-fix-patch.patch

Which is broken.

Quoted 3 lines

Attached is also the patch without the hand-edited deletions:

ieee80211_softmac_fixes_v3.patch

That patch is correct.

Why did you edit the patch metadata in a way that was incorrect?

Quoted 8 lines

My steps once having this were:

- run perl checkpatch -f
- I got total: 4 errors, 0 warnings, 28 lines checked. The 4 warnings were extra white spaces.
- Delete the spaces
- git send-email --annotate Patch

You did a few other things here, you hand-edited the patch, which broke it.

Yes, 'git am' does apply it, but not really, as there's a bug in git that you see I notified the git developers about. So I still can't apply this patch, please resend it in a way that is not broken, like your attachment here :)

thanks,

greg k-h

#6 lore raw
Quoted 78 lines · Greg KH
Quoted 67 lines · Gaston Gonzalez
Quoted 57 lines · Greg KH
Quoted 56 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

Quoted 8 lines
Quoted 3 lines

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

Quoted 7 lines

Yes, there was a commit. In fact the patch prepare: git format-patch -1

Quoted 2 lines

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Attached the original patch I submitted:
0001-Regen-ieee80211_softmac.c-endianness-fix-patch.patch

Which is broken.

Quoted 7 lines
Quoted 3 lines

Attached is also the patch without the hand-edited deletions:

ieee80211_softmac_fixes_v3.patch

That patch is correct.

Why did you edit the patch metadata in a way that was incorrect?

The only edit I did was from within git send-email --annotate. Nothing else. I get now that that editor is not for everything... as I get the rest of the apply process
right, I thought it was ok that way. My bad :(

Quoted 10 lines
Quoted 9 lines

My steps once having this were:

- run perl checkpatch -f
- I got total: 4 errors, 0 warnings, 28 lines checked. The 4 warnings were extra white spaces.
- Delete the spaces
- git send-email --annotate Patch

Quoted 8 lines

You did a few other things here, you hand-edited the patch, which broke it.

Yes, 'git am' does apply it, but not really, as there's a bug in git that you see I notified the git developers about. So I still can't apply this patch, please resend it in a way that is not broken, like your attachment here :)

Ok, will do. Only one question left, I always get checkpatch.pl white spaces errors after git format-patch, some of which weren't there before. So, what is the correct way of fixing them?

Quoted 3 lines

thanks,

greg k-h

Thanks for all the help,

Gaston

maintainer
#7 lore raw
Quoted 83 lines · Gaston Gonzalez
Quoted 82 lines · Greg KH
Quoted 67 lines · Gaston Gonzalez
Quoted 57 lines · Greg KH
Quoted 56 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

Quoted 8 lines
Quoted 3 lines

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

Quoted 7 lines

Yes, there was a commit. In fact the patch prepare: git format-patch -1

Quoted 2 lines

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Attached the original patch I submitted:
0001-Regen-ieee80211_softmac.c-endianness-fix-patch.patch

Which is broken.

Quoted 3 lines

Attached is also the patch without the hand-edited deletions:

ieee80211_softmac_fixes_v3.patch

Quoted 7 lines
Quoted 3 lines

That patch is correct.

Why did you edit the patch metadata in a way that was incorrect?

The only edit I did was from within git send-email --annotate. Nothing else. I get now that that editor is not for everything... as I get the rest of the apply process
right, I thought it was ok that way. My bad :(

That's worrysome, why would --annotate change the lines that relate to the patch linenumbers? Did you do a search/replace or something accidentally?

Quoted 11 lines
Quoted 11 lines
Quoted 7 lines

My steps once having this were:

- run perl checkpatch -f
- I got total: 4 errors, 0 warnings, 28 lines checked. The 4 warnings were extra white spaces.
- Delete the spaces
- git send-email --annotate Patch

You did a few other things here, you hand-edited the patch, which broke it.

Quoted 8 lines
Quoted 5 lines

Yes, 'git am' does apply it, but not really, as there's a bug in git that you see I notified the git developers about. So I still can't apply this patch, please resend it in a way that is not broken, like your attachment here :)

Ok, will do. Only one question left, I always get checkpatch.pl white spaces errors after git format-patch, some of which weren't there before. So, what is the correct way of fixing them?

Fix your editor to not add them :)

thanks,

greg k-h

#8 lore raw
Quoted 88 lines · Greg KH
Quoted 87 lines · Gaston Gonzalez
Quoted 85 lines · Greg KH
Quoted 67 lines · Gaston Gonzalez
Quoted 57 lines · Greg KH
Quoted 56 lines · Gaston Gonzalez
Quoted 41 lines · Greg KH
Quoted 10 lines · Gaston Gonzalez

Fix the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: expected restricted __le16 [usertype] frame_ctl
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:663:32: got int
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: warning: invalid assignment: |=
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: left side has type restricted __le16
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:664:50: right side has type int

Quoted 4 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Still doesn't apply, but this might be a git bug, see below:

Quoted 17 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -3
index d2e8b12..0477ba1 100644
@@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
 	auth = (struct ieee80211_authentication *)
 		skb_put(skb, sizeof(struct ieee80211_authentication));
 
-	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
-	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+	if (challengelen)
+		auth->header.frame_ctl |= cpu_to_le16(IEEE80211_FCTL_WEP);
 
 	auth->header.duration_id = 0x013a; //FIXME
 
--
Quoted 1 line

2.1.4

This patch is not created properly. Did you edit it by hand? If not, we need to report a bug as the diff is obviously wrong, look at the @@@ line.

Quoted 6 lines

Can you update your version of git to see if it's fixed there?

Also, patch tells you that this is broken:

checking file drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
patch: **** malformed patch at line 132: skb_put(skb, sizeof(struct ieee80211_authentication));

Greg,

The patch was prepared using git format-patch. The git version I'm using:

gaston22:\-$ git --version
git version 2.1.4

Quoted 8 lines
Quoted 3 lines

I did deleted 4 whitespaces by hand after running checkpatch.pl on the patch. Could that drive the issue? However, I could properly apply the patch using 'git am' from an email and get the git log right.

Yes, but is there really a commit there? That's what messed me up last time, git applied it, but with no actual diff (which is probably a bug too, just a different one...)

Quoted 7 lines

Yes, there was a commit. In fact the patch prepare: git format-patch -1

Quoted 2 lines

And if you edited it by hand, that might explain the issue, what did the "original" patch look like?

Attached the original patch I submitted:
0001-Regen-ieee80211_softmac.c-endianness-fix-patch.patch

Which is broken.

Quoted 3 lines

Attached is also the patch without the hand-edited deletions:

ieee80211_softmac_fixes_v3.patch

That patch is correct.

Why did you edit the patch metadata in a way that was incorrect?

Quoted 7 lines
Quoted 3 lines

The only edit I did was from within git send-email --annotate. Nothing else. I get now that that editor is not for everything... as I get the rest of the apply process
right, I thought it was ok that way. My bad :(

That's worrysome, why would --annotate change the lines that relate to the patch linenumbers? Did you do a search/replace or something accidentally?

To be honest I don't know, using --annotate I edited: the body 'Fix the following sparse warnings', the signoff and the subject. I thought the subject could be the problem. Nothing below the --- line.

Besides that, only the whitespaces deletion using emacs before the git send-email step.
I really don't think I've accidentally replaced anything.

In some hours I'll be able to build the patch again without the deletions and from scratch just in case. We'll see after the resend, hope it end up ok this time...

Thanks again for all the help and sorry for the noise,

Gaston

Quoted 26 lines
Quoted 12 lines
Quoted 12 lines
Quoted 8 lines

My steps once having this were:

- run perl checkpatch -f
- I got total: 4 errors, 0 warnings, 28 lines checked. The 4 warnings were extra white spaces.
- Delete the spaces
- git send-email --annotate Patch

You did a few other things here, you hand-edited the patch, which broke it.

Quoted 8 lines
Quoted 5 lines

Yes, 'git am' does apply it, but not really, as there's a bug in git that you see I notified the git developers about. So I still can't apply this patch, please resend it in a way that is not broken, like your attachment here :)

Ok, will do. Only one question left, I always get checkpatch.pl white spaces errors after git format-patch, some of which weren't there before. So, what is the correct way of fixing them?

Fix your editor to not add them :)

thanks,

greg k-h