SOURCES (LINUX_2_6): kernel-hotfixes.patch - atmdd.c build fix.
pluto
pluto at pld-linux.org
Mon Oct 3 18:05:51 CEST 2005
Author: pluto Date: Mon Oct 3 16:05:49 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- atmdd.c build fix.
---- Files affected:
SOURCES:
kernel-hotfixes.patch (1.1.2.58 -> 1.1.2.59)
---- Diffs:
================================================================
Index: SOURCES/kernel-hotfixes.patch
diff -u SOURCES/kernel-hotfixes.patch:1.1.2.58 SOURCES/kernel-hotfixes.patch:1.1.2.59
--- SOURCES/kernel-hotfixes.patch:1.1.2.58 Sat Oct 1 00:47:09 2005
+++ SOURCES/kernel-hotfixes.patch Mon Oct 3 18:05:44 2005
@@ -130,3 +130,23 @@
/* Used by sysrq-p, among others. I don't believe r9-r15 are ever
saved in the context it's used. */
+--- a/drivers/atm/atmdd.c 2005-10-03 13:17:48.000000000 +0200
++++ b/drivers/atm/atmdd.c 2005-10-03 17:51:59.322010250 +0200
+@@ -211,6 +211,7 @@
+ while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len)))
+ {
+ struct sk_buff *newskb;
++ struct timeval stamp;
+
+ /* Get a new skb to replace the one just consumed */
+ if (!(newskb = dev_alloc_skb(AAL5_BUFLEN)))
+@@ -242,7 +243,8 @@
+ atomic_inc(&vcc->stats->rx);
+
+ /* add timestamp for upper layers to use */
+- do_gettimeofday(&skb->stamp);
++ do_gettimeofday(&stamp);
++ skb_set_timestamp(skb, &stamp);
+
+ /* Point socket buffer at the right VCC before giving to socket layer */
+ ATM_SKB(skb)->vcc = vcc;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-hotfixes.patch?r1=1.1.2.58&r2=1.1.2.59&f=u
More information about the pld-cvs-commit
mailing list