diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
| commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
| tree | 8200248706960af8b779e9144f5b51c670602228 /net/can/raw.c | |
| parent | 22076c7712be29a602de45b1c573f31adbd428a9 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
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 | ||