[PATCH 050/106] net: Swap ver and type in pppoe_hdr

[Luis Henriques]

3.5.7.18 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Changli Gao <xiaosuo at gmail.com>

commit b1a5a34bd0b8767ea689e68f8ea513e9710b671e upstream.

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

Signed-off-by: David S. Miller <davem at davemloft.net>
[ luis: backported to 3.5:
  - include/uapi/linux/if_pppox.h -> include/linux/if_pppox.h ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 include/linux/if_pppox.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 09c474c..b8b7544 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -140,11 +140,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
-- 
1.8.3.2