Patchwork [U-Boot,2/2] net/tftp: sparse fixes

login
register
mail settings
Submitter Kim Phillips
Date Jan. 17, 2013, 12:09 a.m.
Message ID <20130116180919.2d85db5758ef459f2cff0b0c@freescale.com>
Download mbox | patch
Permalink /patch/213105/
State Accepted
Delegated to: Joe Hershberger
Headers show

Comments

Kim Phillips - Jan. 17, 2013, 12:09 a.m.
tftp.c:464:17: warning: cast to restricted __be16
tftp.c:552:29: warning: cast to restricted __be16
tftp.c:640:33: warning: cast to restricted __be16
tftp.c:642:25: warning: cast to restricted __be16

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 net/tftp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Joe Hershberger - July 8, 2013, 4:05 p.m.
On Wed, Jan 16, 2013 at 6:09 PM, Kim Phillips
<kim.phillips@freescale.com> wrote:
> tftp.c:464:17: warning: cast to restricted __be16
> tftp.c:552:29: warning: cast to restricted __be16
> tftp.c:640:33: warning: cast to restricted __be16
> tftp.c:642:25: warning: cast to restricted __be16
>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> Cc: Joe Hershberger <joe.hershberger@gmail.com>

Applied, Thanks.
-Joe

Patch

diff --git a/net/tftp.c b/net/tftp.c
index 09790eb..6d333d5 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -446,8 +446,8 @@  static void
 TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
 	    unsigned len)
 {
-	ushort proto;
-	ushort *s;
+	__be16 proto;
+	__be16 *s;
 	int i;
 
 	if (dest != TftpOurPort) {
@@ -465,7 +465,7 @@  TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
 		return;
 	len -= 2;
 	/* warning: don't use increment (++) in ntohs() macros!! */
-	s = (ushort *)pkt;
+	s = (__be16 *)pkt;
 	proto = *s++;
 	pkt = (uchar *)s;
 	switch (ntohs(proto)) {
@@ -556,7 +556,7 @@  TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
 		if (len < 2)
 			return;
 		len -= 2;
-		TftpBlock = ntohs(*(ushort *)pkt);
+		TftpBlock = ntohs(*(__be16 *)pkt);
 
 		update_block_number();
 
@@ -644,9 +644,9 @@  TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
 
 	case TFTP_ERROR:
 		printf("\nTFTP error: '%s' (%d)\n",
-		       pkt + 2, ntohs(*(ushort *)pkt));
+		       pkt + 2, ntohs(*(__be16 *)pkt));
 
-		switch (ntohs(*(ushort *)pkt)) {
+		switch (ntohs(*(__be16 *)pkt)) {
 		case TFTP_ERR_FILE_NOT_FOUND:
 		case TFTP_ERR_ACCESS_DENIED:
 			puts("Not retrying...\n");