]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/ixp425-eth/files/2.6.14.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / ixp425-eth / files / 2.6.14.patch
1 # change in field semantic in 2.6.14
2 --- dir/ixp425_eth.c    2005-09-24 17:50:57.828607113 -0700
3 +++ dir/ixp425_eth.c    2005-09-24 17:54:19.593303365 -0700
4 @@ -668,7 +668,11 @@
5   * reset the following fields in the skbuff before re-using it on the Rx-path
6   */
7  #ifdef CONFIG_NETFILTER
8 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
9          skb->nfmark = skb->nfcache = 0;
10 +#else
11 +        skb->nfmark = 0;
12 +#endif
13          nf_conntrack_put(skb->nfct);
14          skb->nfct = NULL;
15  #ifdef CONFIG_NETFILTER_DEBUG
16 @@ -1300,8 +1300,12 @@
17      skb->len -= header_len;
18      
19      /* fill the pkt arrival time (set at the irq callback entry) */
20 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
21      skb->stamp.tv_sec = irq_stamp.tv_sec;
22      skb->stamp.tv_usec = irq_stamp.tv_usec;
23 +#else
24 +    skb_set_timestamp(skb, &irq_stamp);
25 +#endif
26      
27      /* fill the input device field */
28      skb->dev = dev;