projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iio-fixes-for-4.1a-take2' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
include
/
uapi
/
linux
/
if_pppox.h
diff --git
a/include/uapi/linux/if_pppox.h
b/include/uapi/linux/if_pppox.h
index
e36a4ae
..
e128769
100644
(file)
--- a/
include/uapi/linux/if_pppox.h
+++ b/
include/uapi/linux/if_pppox.h
@@
-46,7
+46,7
@@
struct pppoe_addr {
* PPTP addressing definition
*/
struct pptp_addr {
- __
be16
call_id;
+ __
u16
call_id;
struct in_addr sin_addr;
};