From c21918097d0cbcf28e531122d6094dba01598ac7 Mon Sep 17 00:00:00 2001 From: Changli Gao Date: Sun, 22 Aug 2010 18:37:27 -0700 Subject: [PATCH] --- yaml --- r: 213903 b: refs/heads/master c: d8287fc864643beaf1623c92aceb1ab38eae0648 h: refs/heads/master i: 213901: 22c7e963b00025d656d3cf34d7fe0213acd9e996 213899: 6dd56ab81acd29ae41a816d758da01185b5e050d 213895: 3a61209c0b8d8656e0de869f09745d5bf54e6340 213887: 24e2dda4bfe43b95137ddfa0cb2a496dc6b27308 v: v3 --- [refs] | 2 +- trunk/include/linux/if_pppox.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 59c29eb972af..a4af2d824c8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 773bc97397ea2cfc2ff3c075f712aaf376ed7cb0 +refs/heads/master: d8287fc864643beaf1623c92aceb1ab38eae0648 diff --git a/trunk/include/linux/if_pppox.h b/trunk/include/linux/if_pppox.h index 1525b2156b2a..770e8fa669d2 100644 --- a/trunk/include/linux/if_pppox.h +++ b/trunk/include/linux/if_pppox.h @@ -50,8 +50,8 @@ struct pppoe_addr { * PPTP addressing definition */ struct pptp_addr { - u16 call_id; - struct in_addr sin_addr; + __be16 call_id; + struct in_addr sin_addr; }; /************************************************************************