diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /include/net/syncppp.h | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'include/net/syncppp.h')
| -rw-r--r-- | include/net/syncppp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/syncppp.h b/include/net/syncppp.h index 877efa434700..e43f4070d892 100644 --- a/include/net/syncppp.h +++ b/include/net/syncppp.h | |||
| @@ -59,7 +59,7 @@ struct ppp_device | |||
| 59 | 59 | ||
| 60 | static inline struct sppp *sppp_of(struct net_device *dev) | 60 | static inline struct sppp *sppp_of(struct net_device *dev) |
| 61 | { | 61 | { |
| 62 | struct ppp_device **ppp = dev->priv; | 62 | struct ppp_device **ppp = dev->ml_priv; |
| 63 | BUG_ON((*ppp)->dev != dev); | 63 | BUG_ON((*ppp)->dev != dev); |
| 64 | return &(*ppp)->sppp; | 64 | return &(*ppp)->sppp; |
| 65 | } | 65 | } |