diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2010-08-17 08:59:14 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-19 00:08:30 -0700 |
| commit | 2244d07bfa2097cb00600da91c715a8aa547917e (patch) | |
| tree | 44d67d9ffba3697fffeb05c13e88aa76ebc3fd4a /net/can | |
| parent | 4d5870ec103e6569851b9710f0093f072b08439a (diff) | |
| download | op-kernel-dev-2244d07bfa2097cb00600da91c715a8aa547917e.zip op-kernel-dev-2244d07bfa2097cb00600da91c715a8aa547917e.tar.gz | |
net: simplify flags for tx timestamping
This patch removes the abstraction introduced by the union skb_shared_tx in
the shared skb data.
The access of the different union elements at several places led to some
confusion about accessing the shared tx_flags e.g. in skb_orphan_try().
http://marc.info/?l=linux-netdev&m=128084897415886&w=2
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index a10e333..7d77e67 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -647,12 +647,12 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); if (err < 0) goto free_skb; - err = sock_tx_timestamp(msg, sk, skb_tx(skb)); + err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags); if (err < 0) goto free_skb; /* to be able to check the received tx sock reference in raw_rcv() */ - skb_tx(skb)->prevent_sk_orphan = 1; + skb_shinfo(skb)->tx_flags |= SKBTX_DRV_NEEDS_SK_REF; skb->dev = dev; skb->sk = sk; |
