diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /net/can/raw.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index cde1b4a20f75..46cca3a91d19 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
| @@ -681,9 +681,6 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
| 681 | if (err < 0) | 681 | if (err < 0) |
| 682 | goto free_skb; | 682 | goto free_skb; |
| 683 | 683 | ||
| 684 | /* to be able to check the received tx sock reference in raw_rcv() */ | ||
| 685 | skb_shinfo(skb)->tx_flags |= SKBTX_DRV_NEEDS_SK_REF; | ||
| 686 | |||
| 687 | skb->dev = dev; | 684 | skb->dev = dev; |
| 688 | skb->sk = sk; | 685 | skb->sk = sk; |
| 689 | 686 | ||