summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2013-06-29 00:15:51 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-28 16:29:46 -0700
commit51778da544ca660615ea02b09d395430159b4d0c (patch)
tree00c67bfb7e6eb23bc18b1eb0f9d534b6f159deb2
parentea4c218f2c3e67f1bca8078ff1f80d7e0c2ab791 (diff)
downloadlinux-3.10-51778da544ca660615ea02b09d395430159b4d0c.tar.gz
linux-3.10-51778da544ca660615ea02b09d395430159b4d0c.tar.bz2
linux-3.10-51778da544ca660615ea02b09d395430159b4d0c.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/uapi/linux/if_pppox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
index 0b46fd57c8f..e36a4aecd31 100644
--- a/include/uapi/linux/if_pppox.h
+++ b/include/uapi/linux/if_pppox.h
@@ -135,11 +135,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