- 5.4.188

[packages/kernel.git] / kernel-atmdd.patch

diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch
index 71fbbc8da08da822a646ec179507e45c0123d27c..6298f6b1a65ae434083bddc80ead20af27883b9d 100644 (file)
--- a/kernel-atmdd.patch
+++ b/kernel-atmdd.patch
@@ -13,7 +13,7 @@ diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfi
 --- linux-2.4.25/drivers/atm/Kcnfig    2003-08-25 13:44:41.000000000 +0200
 +++ linux-2.4.25-atmdd/drivers/atm/Kconfig     2004-02-29 22:52:59.000000000 +0100
 @@ -4,6 +4,14 @@
-       default y
+         If you say N, all options in this submenu will be skipped and disabled.
  
  if ATM_DRIVERS && NETDEVICES && ATM
 +
@@ -30,7 +30,7 @@ diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfi
 diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.c
 --- linux-2.4.25/drivers/atm/atmdd.c   1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.4.25-atmdd/drivers/atm/atmdd.c     2004-02-29 22:58:11.000000000 +0100
-@@ -0,0 +1,921 @@
+@@ -0,0 +1,920 @@
 +/*
 +#######################################################################
 +#
@@ -170,8 +170,8 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +static int myatmdd_open(struct atm_vcc *vcc);
 +static void myatmdd_close(struct atm_vcc *vcc);
 +static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg);
-+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen);
-+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen);
++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen);
++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen);
 +static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb);
 +static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs);
 +static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page);
@@ -243,7 +243,6 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +    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)))
@@ -275,8 +274,8 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +            atomic_inc(&vcc->stats->rx);
 +
 +            /* add timestamp for upper layers to use */
-+          do_gettimeofday(&stamp);
-+          skb->tstamp = timeval_to_ktime(stamp);
++            ktime_t kt = ktime_get_real();
++            skb->tstamp = kt;
 +        
 +            /* Point socket buffer at the right VCC before giving to socket layer */
 +            ATM_SKB(skb)->vcc = vcc;
@@ -789,12 +788,12 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +    return -EINVAL;
 +}
 +
-+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen)
++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen)
 +{
 +    return -EINVAL;
 +}
 +
-+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen)
++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen)
 +{
 +    return -EINVAL;
 +}