diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-11-20 07:10:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 07:10:51 -0500 |
commit | c19d0369d4c791d90fe0b84d6040a897fe25cc14 (patch) | |
tree | 403634c996d3f16265f1dc8b9340bab8b068500e /drivers/isdn/i4l/isdn_ppp.c | |
parent | 13d2a1d2b032de08d7dcab6a1edcd47802681f96 (diff) |
isdn: isdn_net.c annotate struct ip_ports and trivial sparse fixes
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/i4l/isdn_ppp.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 77c280ef2eb6..bf5821ef192a 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -1289,10 +1289,10 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1289 | *skb_push(skb, 4) = 1; /* indicate outbound */ | 1289 | *skb_push(skb, 4) = 1; /* indicate outbound */ |
1290 | 1290 | ||
1291 | { | 1291 | { |
1292 | u_int16_t *p = (u_int16_t *) skb->data; | 1292 | __be16 *p = (__be16 *)skb->data; |
1293 | 1293 | ||
1294 | p++; | 1294 | p++; |
1295 | *p = htons(proto); | 1295 | *p = htons(proto); |
1296 | } | 1296 | } |
1297 | 1297 | ||
1298 | if (ipt->pass_filter | 1298 | if (ipt->pass_filter |
@@ -1487,10 +1487,10 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) | |||
1487 | *skb_pull(skb, IPPP_MAX_HEADER - 4) = 1; /* indicate outbound */ | 1487 | *skb_pull(skb, IPPP_MAX_HEADER - 4) = 1; /* indicate outbound */ |
1488 | 1488 | ||
1489 | { | 1489 | { |
1490 | u_int16_t *p = (u_int16_t *) skb->data; | 1490 | __be16 *p = (__be16 *)skb->data; |
1491 | 1491 | ||
1492 | p++; | 1492 | p++; |
1493 | *p = htons(proto); | 1493 | *p = htons(proto); |
1494 | } | 1494 | } |
1495 | 1495 | ||
1496 | drop |= is->pass_filter | 1496 | drop |= is->pass_filter |
@@ -1810,14 +1810,14 @@ static u32 isdn_ppp_mp_get_seq( int short_seq, | |||
1810 | 1810 | ||
1811 | if( !short_seq ) | 1811 | if( !short_seq ) |
1812 | { | 1812 | { |
1813 | seq = ntohl(*(u32*)skb->data) & MP_LONGSEQ_MASK; | 1813 | seq = ntohl(*(__be32 *)skb->data) & MP_LONGSEQ_MASK; |
1814 | skb_push(skb,1); | 1814 | skb_push(skb,1); |
1815 | } | 1815 | } |
1816 | else | 1816 | else |
1817 | { | 1817 | { |
1818 | /* convert 12-bit short seq number to 24-bit long one | 1818 | /* convert 12-bit short seq number to 24-bit long one |
1819 | */ | 1819 | */ |
1820 | seq = ntohs(*(u16*)skb->data) & MP_SHORTSEQ_MASK; | 1820 | seq = ntohs(*(__be16 *)skb->data) & MP_SHORTSEQ_MASK; |
1821 | 1821 | ||
1822 | /* check for seqence wrap */ | 1822 | /* check for seqence wrap */ |
1823 | if( !(seq & MP_SHORTSEQ_MAXBIT) && | 1823 | if( !(seq & MP_SHORTSEQ_MAXBIT) && |