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; }; /************************************************************************