[ 3.5.y.z extended stable ] Patch "net: Swap ver and type in pppoe_hdr" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    net: Swap ver and type in pppoe_hdr

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From e38f78ab48988ac51099f787fb0949dbf8437bc5 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo at gmail.com>
Date: Sat, 29 Jun 2013 00:15:51 +0800
Subject: [PATCH] net: Swap ver and type in pppoe_hdr

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.1.2