Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19d0369 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

isdn: isdn_net.c annotate struct ip_ports and trivial sparse fixes 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13d2a1d2

drivers/isdn/i4l/isdn_net.c

+7 −7
Original line number Diff line number Diff line
@@ -865,8 +865,8 @@ isdn_net_hangup(struct net_device *d) 
}



typedef struct {

	unsigned short source;

	unsigned short dest;

	__be16 source;

	__be16 dest;

} ip_ports;



static void
@@ -1355,7 +1355,7 @@ isdn_net_get_stats(struct net_device *dev) 
 *      This is normal practice and works for any 'now in use' protocol.

 */



static unsigned short

static __be16

isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev)

{

	struct ethhdr *eth;
@@ -1817,7 +1817,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb) 
			/* IP with type field */

			olp->huptimer = 0;

			lp->huptimer = 0;

			skb->protocol = *(unsigned short *) &(skb->data[0]);

			skb->protocol = *(__be16 *)&(skb->data[0]);

			skb_pull(skb, 2);

			if (*(unsigned short *) skb->data == 0xFFFF)

				skb->protocol = htons(ETH_P_802_3);
@@ -1899,12 +1899,12 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev, 
			break;

		case ISDN_NET_ENCAP_IPTYP:

			/* ethernet type field */

			*((ushort *) skb_push(skb, 2)) = htons(type);

			*((__be16 *)skb_push(skb, 2)) = htons(type);

			len = 2;

			break;

		case ISDN_NET_ENCAP_UIHDLC:

			/* HDLC with UI-Frames (for ispa with -h1 option) */

			*((ushort *) skb_push(skb, 2)) = htons(0x0103);

			*((__be16 *)skb_push(skb, 2)) = htons(0x0103);

			len = 2;

			break;

		case ISDN_NET_ENCAP_CISCOHDLC:
@@ -1978,7 +1978,7 @@ static void isdn_header_cache_update(struct hh_cache *hh, 
{

	isdn_net_local *lp = dev->priv;

	if (lp->p_encap == ISDN_NET_ENCAP_ETHER)

		return eth_header_cache_update(hh, dev, haddr);

		eth_header_cache_update(hh, dev, haddr);

}



static const struct header_ops isdn_header_ops = {

drivers/isdn/i4l/isdn_ppp.c

+6 −6
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) 
	*skb_push(skb, 4) = 1; /* indicate outbound */



	{

		u_int16_t *p = (u_int16_t *) skb->data;

		__be16 *p = (__be16 *)skb->data;



		p++;

		*p = htons(proto);
@@ -1487,7 +1487,7 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) 
	*skb_pull(skb, IPPP_MAX_HEADER - 4) = 1; /* indicate outbound */



	{

		u_int16_t *p = (u_int16_t *) skb->data;

		__be16 *p = (__be16 *)skb->data;



		p++;

		*p = htons(proto);
@@ -1810,14 +1810,14 @@ static u32 isdn_ppp_mp_get_seq( int short_seq, 
   

   	if( !short_seq )

	{

		seq = ntohl(*(u32*)skb->data) & MP_LONGSEQ_MASK;

		seq = ntohl(*(__be32 *)skb->data) & MP_LONGSEQ_MASK;

		skb_push(skb,1);

	}

	else

	{

		/* convert 12-bit short seq number to 24-bit long one 

	 	*/

		seq = ntohs(*(u16*)skb->data) & MP_SHORTSEQ_MASK;

		seq = ntohs(*(__be16 *)skb->data) & MP_SHORTSEQ_MASK;

	

		/* check for seqence wrap */

		if( !(seq &  MP_SHORTSEQ_MAXBIT) &&