From: Changli Gao <xiaosuo@gmail.com>
Date: Fri, 28 Jun 2013 16:15:51 +0000 (+0800)
Subject: net: Swap ver and type in pppoe_hdr
X-Git-Tag: v2.6.32.62~92
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=b0d43763ffc46f894889a74aa05acd349a3e1ce6;p=unionfs-2.6.39.y.git

net: Swap ver and type in pppoe_hdr

[ Upstream commit b1a5a34bd0b8767ea689e68f8ea513e9710b671e ]

Ver and type in pppoe_hdr should be swapped as defined by RFC2516
section-4.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 90b5fae5d71..1750054ac45 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -108,11 +108,11 @@ struct pppoe_tag {
 
 struct pppoe_hdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 ver : 4;
 	__u8 type : 4;
+	__u8 ver : 4;
 #elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8 type : 4;
 	__u8 ver : 4;
+	__u8 type : 4;
 #else
 #error	"Please fix <asm/byteorder.h>"
 #endif