diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2011-01-06 13:37:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-10 16:13:33 -0800 |
| commit | 96545aeb7b4457594d764af4d689a738e97f14b8 (patch) | |
| tree | f916a4b5e95a336db645ab725a4301cc0d71001a /drivers/net/ppp_mppe.c | |
| parent | d7b92affba524e0ca848a5ab60649fb91190d9b5 (diff) | |
| download | lwn-96545aeb7b4457594d764af4d689a738e97f14b8.tar.gz lwn-96545aeb7b4457594d764af4d689a738e97f14b8.zip | |
net: ppp: use {get,put}_unaligned_be{16,32}
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Reviewed-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp_mppe.c')
| -rw-r--r-- | drivers/net/ppp_mppe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index 6d1a1b80cc3e..9a1849a83e2a 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c @@ -55,6 +55,7 @@ #include <linux/ppp_defs.h> #include <linux/ppp-comp.h> #include <linux/scatterlist.h> +#include <asm/unaligned.h> #include "ppp_mppe.h" @@ -395,16 +396,14 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, */ obuf[0] = PPP_ADDRESS(ibuf); obuf[1] = PPP_CONTROL(ibuf); - obuf[2] = PPP_COMP >> 8; /* isize + MPPE_OVHD + 1 */ - obuf[3] = PPP_COMP; /* isize + MPPE_OVHD + 2 */ + put_unaligned_be16(PPP_COMP, obuf + 2); obuf += PPP_HDRLEN; state->ccount = (state->ccount + 1) % MPPE_CCOUNT_SPACE; if (state->debug >= 7) printk(KERN_DEBUG "mppe_compress[%d]: ccount %d\n", state->unit, state->ccount); - obuf[0] = state->ccount >> 8; - obuf[1] = state->ccount & 0xff; + put_unaligned_be16(state->ccount, obuf); if (!state->stateful || /* stateless mode */ ((state->ccount & 0xff) == 0xff) || /* "flag" packet */ |