diff options
Diffstat (limited to 'drivers/net/ppp_generic.c')
-rw-r--r-- | drivers/net/ppp_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index c6de566188e4..11b575f89856 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -83,7 +83,7 @@ struct ppp_file { | |||
83 | int dead; /* unit/channel has been shut down */ | 83 | int dead; /* unit/channel has been shut down */ |
84 | }; | 84 | }; |
85 | 85 | ||
86 | #define PF_TO_X(pf, X) ((X *)((char *)(pf) - offsetof(X, file))) | 86 | #define PF_TO_X(pf, X) container_of(pf, X, file) |
87 | 87 | ||
88 | #define PF_TO_PPP(pf) PF_TO_X(pf, struct ppp) | 88 | #define PF_TO_PPP(pf) PF_TO_X(pf, struct ppp) |
89 | #define PF_TO_CHANNEL(pf) PF_TO_X(pf, struct channel) | 89 | #define PF_TO_CHANNEL(pf) PF_TO_X(pf, struct channel) |
@@ -834,7 +834,7 @@ static int ppp_unattached_ioctl(struct ppp_file *pf, struct file *file, | |||
834 | return err; | 834 | return err; |
835 | } | 835 | } |
836 | 836 | ||
837 | static struct file_operations ppp_device_fops = { | 837 | static const struct file_operations ppp_device_fops = { |
838 | .owner = THIS_MODULE, | 838 | .owner = THIS_MODULE, |
839 | .read = ppp_read, | 839 | .read = ppp_read, |
840 | .write = ppp_write, | 840 | .write = ppp_write, |