diff options
| author | Kumar Sanghvi <kumar.sanghvi@stericsson.com> | 2011-01-07 01:57:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-10 16:12:00 -0800 |
| commit | d7b92affba524e0ca848a5ab60649fb91190d9b5 (patch) | |
| tree | fef6752b8b022fb4b92018e3a0039a964cd0d979 /net/caif | |
| parent | 545ecdc3b3a2fe0b54a3053bf8bf85321bbca7da (diff) | |
| download | linux-stable-d7b92affba524e0ca848a5ab60649fb91190d9b5.tar.gz linux-stable-d7b92affba524e0ca848a5ab60649fb91190d9b5.tar.bz2 linux-stable-d7b92affba524e0ca848a5ab60649fb91190d9b5.zip | |
CAIF: Fix IPv6 support in receive path for GPRS/3G
Checks version field of IP in the receive path for GPRS/3G data
and appropriately sets the value of skb->protocol.
Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
| -rw-r--r-- | net/caif/chnl_net.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 84a422c98941..fa9dab372b68 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -76,6 +76,8 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) struct chnl_net *priv = container_of(layr, struct chnl_net, chnl); int pktlen; int err = 0; + const u8 *ip_version; + u8 buf; priv = container_of(layr, struct chnl_net, chnl); @@ -90,7 +92,21 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) * send the packet to the net stack. */ skb->dev = priv->netdev; - skb->protocol = htons(ETH_P_IP); + + /* check the version of IP */ + ip_version = skb_header_pointer(skb, 0, 1, &buf); + if (!ip_version) + return -EINVAL; + switch (*ip_version >> 4) { + case 4: + skb->protocol = htons(ETH_P_IP); + break; + case 6: + skb->protocol = htons(ETH_P_IPV6); + break; + default: + return -EINVAL; + } /* If we change the header in loop mode, the checksum is corrupted. */ if (priv->conn_req.protocol == CAIFPROTO_DATAGRAM_LOOP) |