Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
net
/
can
/
af_can.c
diff --git
a/kernel/net/can/af_can.c
b/kernel/net/can/af_can.c
index
689c818
..
62c635f
100644
(file)
--- a/
kernel/net/can/af_can.c
+++ b/
kernel/net/can/af_can.c
@@
-89,6
+89,8
@@
struct timer_list can_stattimer; /* timer for statistics update */
struct s_stats can_stats; /* packet statistics */
struct s_pstats can_pstats; /* receive list statistics */
struct s_stats can_stats; /* packet statistics */
struct s_pstats can_pstats; /* receive list statistics */
+static atomic_t skbcounter = ATOMIC_INIT(0);
+
/*
* af_can socket functions
*/
/*
* af_can socket functions
*/
@@
-310,12
+312,8
@@
int can_send(struct sk_buff *skb, int loop)
return err;
}
return err;
}
- if (newskb) {
- if (!(newskb->tstamp.tv64))
- __net_timestamp(newskb);
-
+ if (newskb)
netif_rx_ni(newskb);
netif_rx_ni(newskb);
- }
/* update statistics */
can_stats.tx_frames++;
/* update statistics */
can_stats.tx_frames++;
@@
-683,6
+681,10
@@
static void can_receive(struct sk_buff *skb, struct net_device *dev)
can_stats.rx_frames++;
can_stats.rx_frames_delta++;
can_stats.rx_frames++;
can_stats.rx_frames_delta++;
+ /* create non-zero unique skb identifier together with *skb */
+ while (!(can_skb_prv(skb)->skbcnt))
+ can_skb_prv(skb)->skbcnt = atomic_inc_return(&skbcounter);
+
rcu_read_lock();
/* deliver the packet to sockets listening on all devices */
rcu_read_lock();
/* deliver the packet to sockets listening on all devices */