diff options
author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-02 15:56:18 +0000 |
---|---|---|
committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-02 15:56:18 +0000 |
commit | c0457fbb70aef2b96566adb74bbc87f9359666bc (patch) | |
tree | 84bf9af4c2f041b1cfd06f9a864788edffe83864 /ztd-eth.c | |
parent | 8b912155278e1be351e9cbea186ceac746c468f9 (diff) |
Add support for the 2.6.22 kernel. (issue #10095 reported by Matti)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2675 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'ztd-eth.c')
-rw-r--r-- | ztd-eth.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -92,7 +92,11 @@ static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet { struct zt_span *span; struct ztdeth_header *zh; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + zh = (struct ztdeth_header *)skb_network_header(skb); +#else zh = (struct ztdeth_header *)skb->nh.raw; +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9) span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr); #else @@ -171,7 +175,11 @@ static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) /* Setup protocol and such */ skb->protocol = __constant_htons(ETH_P_ZTDETH); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + skb_set_network_header(skb, 0); +#else skb->nh.raw = skb->data; +#endif skb->dev = dev; if (dev->hard_header) dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len); |